Fix a couple of segfaults related to using curses when it isn't there.

1 files changed, 16 insertions, 14 deletions

diff --git a/mx.c b/mx.c
index 0fb6de03..2f740eb3 100644
--- a/mx.c
+++ b/mx.c
@@ -106,23 +106,25 @@ static int dotlock_file (const char *path, int retry)
 
 retry_lock:
   mutt_clear_error();
-  if((r = invoke_dotlock(path, flags, retry)) == DL_EX_EXIST
-     && !option (OPTNOCURSES))
+  if((r = invoke_dotlock(path, flags, retry)) == DL_EX_EXIST)
   {
-    char msg[LONG_STRING];
-
-    snprintf(msg, sizeof(msg), _("Lock count exceeded, remove lock for %s?"),
-	     path);
-    if(retry && mutt_yesorno(msg, 1) == 1)
+    if (!option (OPTNOCURSES))
     {
-      flags |= DL_FL_FORCE;
-      retry--;
-      goto retry_lock;
+      char msg[LONG_STRING];
+      
+      snprintf(msg, sizeof(msg), _("Lock count exceeded, remove lock for %s?"),
+	       path);
+      if(retry && mutt_yesorno(msg, 1) == 1)
+      {
+	flags |= DL_FL_FORCE;
+	retry--;
+	goto retry_lock;
+      }
+    } 
+    else
+    {
+      mutt_error ( _("Can't dotlock %s.\n"), path);
     }
-  } 
-  else if (option (OPTNOCURSES))
-  {
-    mutt_error ( _("Can't dotlock %s.\n"), path);
   }
   return (r == DL_EX_OK ? 0 : -1);
 }