[[ Bug 13569 ]] Different approach by detaching players before preopencard messages are sent, and re-attaching them after

livecodepanos · livecodepanos · commit 845136bce944 · 2014-10-14T12:04:26.000+01:00
diff --git a/engine/src/player-platform.cpp b/engine/src/player-platform.cpp
@@ -871,6 +871,10 @@ MCPlayer::MCPlayer()
     // MW-2014-07-16: [[ Bug ]] Put the player in the list.
     nextplayer = MCplayers;
     MCplayers = this;
+    
+    // PM-2104-10-14: [[ Bug 13569 ]] Make sure changes to player in preOpenCard are not visible
+    m_is_attached = false;
+    m_should_attach = false;
 }
 
 MCPlayer::MCPlayer(const MCPlayer &sref) : MCControl(sref)
@@ -960,6 +964,8 @@ void MCPlayer::open()
 {
 	MCControl::open();
 	prepare(MCnullstring);
+    MCPlatformAttachPlayer(m_platform_player, getstack() -> getwindow());
+    m_is_attached = true;;
 }
 
 void MCPlayer::close()
@@ -974,6 +980,9 @@ void MCPlayer::close()
     
     if (s_volume_popup != nil)
         s_volume_popup -> close();
+    
+    MCPlatformDetachPlayer(m_platform_player);
+    m_is_attached = false;
 }
 
 Boolean MCPlayer::kdown(const char *string, KeySym key)
@@ -2100,7 +2109,8 @@ Boolean MCPlayer::prepare(const char *options)
 	t_visible = getflag(F_VISIBLE);
 	MCPlatformSetPlayerProperty(m_platform_player, kMCPlatformPlayerPropertyVisible, kMCPlatformPropertyTypeBool, &t_visible);
 	
-	MCPlatformAttachPlayer(m_platform_player, getstack() -> getwindow());
+    //attachplayer();
+    m_is_attached = false;
 	
 	layer_redrawall();
 	
@@ -2118,6 +2128,35 @@ Boolean MCPlayer::prepare(const char *options)
 	return ok;
 }
 
+// PM-2014-10-14: [[ Bug 13569 ]] Make sure changes to player are not visible in preOpenCard
+void MCPlayer::attachplayer()
+{
+    if (m_platform_player == nil)
+        return;
+    
+    // Make sure we attach the player only if it was previously detached by detachplayer().
+    if (!m_is_attached && m_should_attach)
+    {
+        MCPlatformAttachPlayer(m_platform_player, getstack() -> getwindow());
+        m_is_attached = true;
+        m_should_attach = false;
+    }
+}
+
+// PM-2014-10-14: [[ Bug 13569 ]] Make sure changes to player are not visible in preOpenCard
+void MCPlayer::detachplayer()
+{
+    if (m_platform_player == nil)
+        return;
+    
+    if (m_is_attached)
+    {
+        MCPlatformDetachPlayer(m_platform_player);
+        m_is_attached = false;
+        m_should_attach = true;
+    }
+}
+
 Boolean MCPlayer::playstart(const char *options)
 {
 	if (!prepare(options))
@@ -2208,6 +2247,7 @@ Boolean MCPlayer::playstop()
 		needmessage = getduration() > getmoviecurtime();
 		
 		MCPlatformDetachPlayer(m_platform_player);
+        m_is_attached = false;
 	}
     
     redrawcontroller();
diff --git a/engine/src/player-platform.h b/engine/src/player-platform.h
@@ -86,6 +86,8 @@ class MCPlayer : public MCControl
     bool m_scrub_back_is_pressed : 1;
     bool m_scrub_forward_is_pressed : 1;
     bool m_modify_selection_while_playing : 1;
+    bool m_is_attached : 1;
+    bool m_should_attach : 1;
 	
 public:
 	MCPlayer();
@@ -266,6 +268,10 @@ class MCPlayer : public MCControl
     void handle_mfocus(int x, int y);
     
     void popup_closed(void);
+    
+    // PM-2014-10-14: [[ Bug 13569 ]] Make sure changes to player are not visible in preOpenCard
+    void attachplayer(void);
+    void detachplayer(void);
 };
 
 #endif
diff --git a/engine/src/stack3.cpp b/engine/src/stack3.cpp
@@ -1007,7 +1007,7 @@ Exec_stat MCStack::setcard(MCCard *card, Boolean recent, Boolean dynamic)
 	// MW-2011-09-14: [[ Redraw ]] We lock the screen between before closeCard and until
 	//   after preOpenCard.
 	MCRedrawLockScreen();
-
+    
 	MCCard *oldcard = curcard;
 	Boolean oldlock = MClockmessages;
 	if (card != oldcard)
@@ -1077,29 +1077,23 @@ Exec_stat MCStack::setcard(MCCard *card, Boolean recent, Boolean dynamic)
 
         if (!t_error)
         {
-            // PM-2014-10-13: [[ Bug 13569 ]] Hide player to avoid redraw issue on preOpenCard
+            // PM-2014-10-13: [[ Bug 13569 ]] Detach all players before any messages are sent
             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_player -> detachplayer();
+                
             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;
+            
+            // PM-2014-10-13: [[ Bug 13569 ]] after any messages are sent, attach all players previously detached
+             for(MCPlayer *t_player = MCplayers; t_player != nil; t_player = t_player -> getnextplayer())
+                 if (t_player -> getstack() == curcard -> getstack())
+                    t_player -> attachplayer();
+        }
         
         if (t_error)
 		{
