[ios] fixed, do not call stop directly, send a message to quit so the…

… quit happens in a controlled way and in the right thread context
xbmc · Nov 26, 2011 · 010b6d6 · 010b6d6
1 parent 8649a2d
commit 010b6d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/xbmc/osx/atv2/XBMCEAGLView.mm b/xbmc/osx/atv2/XBMCEAGLView.mm
@@ -238,7 +238,10 @@ - (void) stopAnimation
     [self deinitDisplayLink];
 		animating = FALSE;
     if (!g_application.m_bStop)
-      g_application.Stop(0);
+    {
+      ThreadMessage tMsg = {TMSG_QUIT};
+      g_application.getApplicationMessenger().SendMessage(tMsg);
+    }
     // wait for animation thread to die
     if ([animationThread isFinished] == NO)
       [animationThreadLock lockWhenCondition:TRUE];
@@ -301,8 +304,8 @@ - (void) runAnimation:(id) arg
   // reload Lowtide/AppleTV, boo.
   [g_xbmcController enableScreenSaver];
   [g_xbmcController enableSystemSleep];
-  exit(0);
   //[g_xbmcController applicationDidExit];
+  exit(0);
 }
 
 //--------------------------------------------------------------

diff --git a/xbmc/osx/ios/XBMCEAGLView.mm b/xbmc/osx/ios/XBMCEAGLView.mm
@@ -262,7 +262,10 @@ - (void) stopAnimation
     [self deinitDisplayLink];
 		animating = FALSE;
     if (!g_application.m_bStop)
-      g_application.Stop(0);
+    {
+      ThreadMessage tMsg = {TMSG_QUIT};
+      g_application.getApplicationMessenger().SendMessage(tMsg);
+    }
     // wait for animation thread to die
     if ([animationThread isFinished] == NO)
       [animationThreadLock lockWhenCondition:TRUE];
@@ -326,8 +329,8 @@ - (void) runAnimation:(id) arg
   // reload Lowtide/AppleTV, boo.
   [g_xbmcController enableScreenSaver];
   [g_xbmcController enableSystemSleep];
-  exit(0);
   //[g_xbmcController applicationDidExit];
+  exit(0);
 }
 
 //--------------------------------------------------------------