Ticket #2229: mc-no-mcview_update-on-quit.patch

actions_cmd.c

@@ -242 +242 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-static cb_ret_t
+static int
 mcview_execute_cmd (mcview_t * view, unsigned long command)
 {
     int res = MSG_HANDLED;
@@ -376 +376 @@
     case CK_ViewQuit:
         if (!mcview_is_in_panel (view))
             dlg_stop (view->widget.owner);
-        break;
+        return -1;
     default:
         res = MSG_NOT_HANDLED;
     }
@@ -384 +384 @@
 }
 
 /* Both views */
-static cb_ret_t
+static int
 mcview_handle_key (mcview_t * view, int key)
 {
     unsigned long command;
+    int res;
 
     key = convert_from_input_c (key);
 
@@ -402 +403 @@
     }
 
     command = lookup_keymap_command (view->plain_map, key);
-    if ((command != CK_Ignore_Key) && (mcview_execute_cmd (view, command) == MSG_HANDLED))
-        return MSG_HANDLED;
+    if (command != CK_Ignore_Key)
+    {
+        res = mcview_execute_cmd (view, command);
+        if (res != MSG_NOT_HANDLED)
+            return res;
+    }
 
 #ifdef MC_ENABLE_DEBUGGING_CODE
     if (c == 't')
@@ -450 +455 @@
 mcview_callback (Widget * w, widget_msg_t msg, int parm)
 {
     mcview_t *view = (mcview_t *) w;
-    cb_ret_t i;
+    int i;
 
     mcview_compute_areas (view);
     mcview_update_bytes_per_line (view);
@@ -475 +480 @@
 
     case WIDGET_KEY:
         i = mcview_handle_key (view, parm);
-        mcview_update (view);
+        if (i == MSG_HANDLED)
+            mcview_update (view);
+        if (i == -1)
+            i = MSG_HANDLED;
         return i;
 
     case WIDGET_COMMAND: