Need to remove lock only if interactive mode was launched before.

2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4292973..637dee8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
 	* src/io.c: missing 'T' letter added in DURATION field for ical
 	export (thanks cuz for reporting this)
+
+	* src/utils.c (exit_calcurse): remove lock only if interactive
+	mode was launched
 	
 2009-06-22  Frederic Culot  <frederic@culot.org>
 
diff --git a/src/utils.c b/src/utils.c
index 42c4170..4c492d9 100755
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,4 +1,4 @@
-/*	$calcurse: utils.c,v 1.70 2009/06/21 18:16:23 culot Exp $	*/
+/*	$calcurse: utils.c,v 1.71 2009/06/23 08:52:07 culot Exp $	*/
 
 /*
  * Calcurse - text-based organizer
@@ -51,6 +51,8 @@
 void
 exit_calcurse (int status)
 {
+  int remove_lock;
+  
   if (ui_mode == UI_CURSES)
     {
       notify_stop_main_thread ();
@@ -58,7 +60,11 @@ exit_calcurse (int status)
       refresh ();
       endwin ();
       ui_mode = UI_CMDLINE;
+      remove_lock = 1;
     }
+  else
+    remove_lock = 0;
+  
   calendar_stop_date_thread ();
   io_stop_psave_thread ();
   day_free_list ();
@@ -74,7 +80,9 @@ exit_calcurse (int status)
   notify_free_app ();
   keys_free ();
   mem_stats ();
-  io_unset_lock ();
+  if (remove_lock)
+    io_unset_lock ();
+  
   exit (status);
 }