[[ Bug 13569 ]] Make sure changes to player in preOpenCard are not visible to the user

livecodepanos · livecodepanos · commit 687f0081acbc · 2014-10-13T17:54:16.000+01:00
diff --git a/docs/notes/bugfix-13569.md b/docs/notes/bugfix-13569.md
@@ -0,0 +1 @@
+#     changes to [[Player]] in preOpenCard are visible to user
diff --git a/engine/src/stack3.cpp b/engine/src/stack3.cpp
@@ -1052,9 +1052,11 @@ Exec_stat MCStack::setcard(MCCard *card, Boolean recent, Boolean dynamic)
 		//   again - in particular, players will keep playing.
 		curcard->open();
 		
+        
 		// MW-2011-11-23: [[ Bug ]] Close the old card here to ensure no players
 		//   linger longer than they should.
 		oldcard -> close();
+        
 
 		// MW-2011-09-12: [[ MacScroll ]] Use 'getnextscroll()' to see if anything needs
 		//   changing on that score.
@@ -1067,12 +1069,39 @@ Exec_stat MCStack::setcard(MCCard *card, Boolean recent, Boolean dynamic)
 		updatecardsize();
 
 		// MW-2008-10-31: [[ ParentScripts ]] Send preOpenControl appropriately
-		if (curcard -> openbackgrounds(true, oldcard) == ES_ERROR
-		        || curcard != card || !opened
-		        || curcard->message(MCM_preopen_card) == ES_ERROR
-		        || curcard != card || !opened
-				|| curcard -> opencontrols(true) == ES_ERROR
-				|| curcard != card || !opened)
+        bool t_error;
+        t_error = false;
+        
+        if (!t_error)
+            t_error = curcard -> openbackgrounds(true, oldcard) == ES_ERROR || curcard != card || !opened;
+
+        if (!t_error)
+        {
+            // PM-2014-10-13: [[ Bug 13569 ]] Hide player to avoid redraw issue on preOpenCard
+            for(MCPlayer *t_player = MCplayers; t_player != nil; t_player = t_player -> getnextplayer())
+                if (t_player -> getstack() == curcard -> getstack())
+                {
+                    MCExecPoint ep(nil,nil,nil);
+                    ep.setboolean(False);
+                    t_player -> setprop(0, P_VISIBLE, ep, False);
+                }
+            
+            t_error = curcard->message(MCM_preopen_card) == ES_ERROR || curcard != card || !opened;
+            
+            // PM-2014-10-13: [[ Bug 13569 ]] when preOpenCard handler finish, show the player
+            for(MCPlayer *t_player = MCplayers; t_player != nil; t_player = t_player -> getnextplayer())
+                if (t_player -> getstack() == curcard -> getstack())
+                {
+                    MCExecPoint ep(nil,nil,nil);
+                    ep.setboolean(True);
+                    t_player -> setprop(0, P_VISIBLE, ep, False);
+                }
+        }
+        
+        if (!t_error)
+            t_error = curcard -> opencontrols(true) == ES_ERROR || curcard != card || !opened;
+        
+        if (t_error)
 		{
 			// MW-2011-08-18: [[ Redraw ]] Use global screen lock
 			MCRedrawUnlockScreen();
@@ -1086,6 +1115,7 @@ Exec_stat MCStack::setcard(MCCard *card, Boolean recent, Boolean dynamic)
 				return ES_ERROR;
 			}
 		}
+        
 		MClockmessages = True;
 
 		if (mode == WM_TOP_LEVEL || mode == WM_TOP_LEVEL_LOCKED)
@@ -1166,6 +1196,7 @@ Exec_stat MCStack::setcard(MCCard *card, Boolean recent, Boolean dynamic)
 		if (MCmousestackptr == this && !mfocus(MCmousex, MCmousey))
 			curcard->message(MCM_mouse_enter);
 	}
+    
 	return ES_NORMAL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# changes to [[Player]] in preOpenCard are visible to user`