Merge branch '3557_editor_not_close_ctrlg'

* 3557_editor_not_close_ctrlg:
  Ticket #3557: mcedit should not be closed on Ctrl-G.
This commit is contained in:
Andrew Borodin 2016-03-08 09:31:41 +03:00
commit b9a78aea36

View File

@ -742,13 +742,14 @@ edit_dialog_command_execute (WDialog * h, long command)
break;
case CK_Quit:
case CK_Cancel:
/* don't close editor due to SIGINT, but stop move/resize window */
{
Widget *w = WIDGET (h->current->data);
if (!edit_widget_is_editor (w) || ((WEdit *) w)->drag_state == MCEDIT_DRAG_NORMAL)
dlg_stop (h);
else
if (edit_widget_is_editor (w) && ((WEdit *) w)->drag_state != MCEDIT_DRAG_NORMAL)
edit_restore_size ((WEdit *) w);
else if (command == CK_Quit)
dlg_stop (h);
}
break;
case CK_About: