Merge pull request #5313 from runrevmark/bugfix-19479

runrevmark · web-flow · commit b5e7df2bd244 · 2017-03-28T10:23:14.000+01:00
[[ Bug 19479 ]] Make modals close automatically on Cmd-.
diff --git a/docs/notes/bugfix-19479.md b/docs/notes/bugfix-19479.md
@@ -0,0 +1,11 @@
+# Cmd-. does not affect modal dialogs
+
+Previously using the abort-script keyboard combination (Cmd-. on Mac) would
+cause an abort error to be thrown. However, this would be silently swallowed
+by any modal command (or equivalent) meaning that unusable modal dialogs
+would be uncloseable, requiring the need to restart the IDE / engine.
+
+This has been fixed by making Cmd-. cause an automatic 'close this stack'
+when it occurs in a modal loop and allowInterrupts is true, and the current
+stack has cantAbort set to false.
+
diff --git a/engine/src/stack2.cpp b/engine/src/stack2.cpp
@@ -2473,6 +2473,7 @@ Exec_stat MCStack::openrect(const MCRectangle &rel, Window_mode wm, MCStack *par
 	// MW-2011-01-12: [[ Bug 9282 ]] Set to true if the props need restoring.
 	bool t_restore_props;
 	
+    Exec_stat t_stat = ES_NORMAL;
 	if (opened && flags & F_VISIBLE)
 	{
 		// MW-2011-08-19: [[ Redraw ]] Set the update region to everything.
@@ -2522,22 +2523,40 @@ Exec_stat MCStack::openrect(const MCRectangle &rel, Window_mode wm, MCStack *par
 			// If opening the dialog failed for some reason, this will return false.
 			if (mode_openasdialog())
 			{
-				while (opened && (mode == WM_MODAL || mode == WM_SHEET) && !MCquit)
+				while (opened &&
+                       (mode == WM_MODAL || mode == WM_SHEET) &&
+                       !MCquit &&
+                       !MCabortscript)
 				{
 					MCU_resetprops(True);
 					// MW-2011-09-08: [[ Redraw ]] Make sure we flush any updates.
 					MCRedrawUpdateScreen();
 					MCscreen->siguser();
-					MCscreen->wait(REFRESH_INTERVAL, True, True);
+					if (MCscreen->wait(REFRESH_INTERVAL, True, True))
+                    {
+                        MCeerror->add(EE_WAIT_ABORT, 0, 0);
+                        t_stat = ES_ERROR;
+                        break;
+                    }
 				}
 				mode_closeasdialog();
 				if (MCquit)
 					MCabortscript = False;
 			}
 
-			// Make sure the mode is reset to closed so dialogs can be reopened.
-			mode = WM_CLOSED;
-			
+            // If there was no error, make sure the mode is reset to closed so
+            // it can be reopened. Otherwise, do the equivalent of 'close this
+            // stack'.
+            if (t_stat != ES_ERROR)
+            {
+                mode = WM_CLOSED;
+            }
+            else
+            {
+                close();
+                checkdestroy();
+			}
+            
 			t_restore_props = true;
 		}
 		else
@@ -2572,7 +2591,8 @@ Exec_stat MCStack::openrect(const MCRectangle &rel, Window_mode wm, MCStack *par
 	}
 	if (reopening)
 		MClockmessages = oldlock;
-	return ES_NORMAL;
+    
+	return t_stat;
 	
 	
 }
