Merge branch 'bugfix-13167' into develop

runrevmark · runrevmark · commit a07bc8c14ae6 · 2014-08-12T14:14:18.000+01:00
diff --git a/docs/notes/bugfix-13167.md b/docs/notes/bugfix-13167.md
@@ -0,0 +1 @@
+# Crash when stack loses focus.
diff --git a/engine/src/card.cpp b/engine/src/card.cpp
@@ -232,8 +232,10 @@ void MCCard::kfocus()
 	if (oldkfocused != NULL && kfocused == NULL)
 	{
 		kfocused = oldkfocused;
+        // MW-2014-08-12: [[ Bug 13167 ]] Sync the view focus before the engine state
+        //   (otherwise the engine state can change due to script).
+        MCscreen -> controlgainedfocus(getstack(), kfocused -> getid());
 		kfocused->getref()->kfocus();
-		MCscreen -> controlgainedfocus(getstack(), kfocused -> getid());
 	}
 	if (kfocused == NULL)
 		kfocusnext(True);
@@ -269,8 +271,10 @@ Boolean MCCard::kfocusnext(Boolean top)
 					if (oldkfocused->getref() == MCactivefield
 					        && !MCactivefield->getflag(F_LIST_BEHAVIOR))
 						MCactivefield->unselect(False, True);
-					oldkfocused->getref()->kunfocus();
+                    // MW-2014-08-12: [[ Bug 13167 ]] Sync the view focus before the engine state
+                    //   (otherwise the engine state can change due to script).
 					MCscreen -> controllostfocus(getstack(), oldkfocused -> getid());
+					oldkfocused->getref()->kunfocus();
 					if (oldkfocused == NULL)
 						return False;
 				}
@@ -326,8 +330,10 @@ Boolean MCCard::kfocusprev(Boolean bottom)
 					if (oldkfocused->getref() == MCactivefield
 					        && !MCactivefield->getflag(F_LIST_BEHAVIOR))
 						MCactivefield->unselect(False, True);
-					oldkfocused->getref()->kunfocus();
+                    // MW-2014-08-12: [[ Bug 13167 ]] Sync the view focus before the engine state
+                    //   (otherwise the engine state can change due to script).
 					MCscreen -> controllostfocus(getstack(), oldkfocused -> getid());
+					oldkfocused->getref()->kunfocus();
 					if (oldkfocused == NULL)
 						return False;
 				}
@@ -357,10 +363,10 @@ void MCCard::kunfocus()
 	{
 		oldkfocused = kfocused;
 		kfocused = NULL;
+        // MW-2014-08-12: [[ Bug 13167 ]] Sync the view focus before the engine state
+        //   (otherwise the engine state can change due to script).
+        MCscreen -> controllostfocus(getstack(), oldkfocused -> getid());
 		oldkfocused->getref()->kunfocus();
-        // PM-2014-04-03: [[Bug 12056]] Make sure oldkfocused is not NULL, or else IDE crashes
-        if (oldkfocused != NULL)
-            MCscreen -> controllostfocus(getstack(), oldkfocused -> getid());
 	}
 	else
 	{
@@ -1394,8 +1400,10 @@ void MCCard::kfocusset(MCControl *target)
 		if (tkfocused != NULL && tkfocused->getref() != target)
 		{
 			kfocused = NULL;
+            // MW-2014-08-12: [[ Bug 13167 ]] Sync the view focus before the engine state
+            //   (otherwise the engine state can change due to script).
+            MCscreen -> controllostfocus(getstack(), tkfocused -> getid());
 			tkfocused->getref()->kunfocus();
-			MCscreen -> controllostfocus(getstack(), tkfocused -> getid());
 		}
 		if (kfocused != NULL)
 			return;
@@ -1405,11 +1413,10 @@ void MCCard::kfocusset(MCControl *target)
 		{
 			if (kfocused->getref()->kfocusset(target))
 			{
+                // MW-2014-08-12: [[ Bug 13167 ]] Sync the view focus before the engine state
+                //   (otherwise the engine state can change due to script).
+                MCscreen -> controlgainedfocus(getstack(), kfocused -> getid());
 				kfocused->getref()->kfocus();
-                // MW-2014-08-06: [[ Bug 13072 ]] Only invoke this if kfocused is still non-nil
-                //   (if focusing the control refocuses, it will be nil).
-                if (kfocused != nil)
-                    MCscreen -> controlgainedfocus(getstack(), kfocused -> getid());
 
 				// OK-2009-04-29: [[Bug 8013]] - Its possible that kfocus() can set kfocused to NULL if the 
 				// user handles the message and does something to unfocus the object (e.g. select empty)
