From bf41b216d38de478d453efcb6ba6588e921c3087 Mon Sep 17 00:00:00 2001
From: sekotin <sekotin@gmail.com>
Date: Wed, 4 Jun 2014 19:05:01 +0300
Subject: [PATCH] Fix MP shutdown cleanup order

---
 mediaportal/MediaPortal.Application/D3D.cs         | 4 +++-
 mediaportal/MediaPortal.Application/MediaPortal.cs | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mediaportal/MediaPortal.Application/D3D.cs b/mediaportal/MediaPortal.Application/D3D.cs
index 11a3360..fb19004 100644
--- a/mediaportal/MediaPortal.Application/D3D.cs
+++ b/mediaportal/MediaPortal.Application/D3D.cs
@@ -2399,7 +2399,9 @@ namespace MediaPortal
       {
         _isClosing = true;
         GUIGraphicsContext.CurrentState = GUIGraphicsContext.State.STOPPING;
-        g_Player.Stop();
+        g_Player.Stop();
+
+        OnExit();
       }
       base.OnFormClosing(formClosingEventArgs);
     }
diff --git a/mediaportal/MediaPortal.Application/MediaPortal.cs b/mediaportal/MediaPortal.Application/MediaPortal.cs
index 6f36fe1..b76b625 100644
--- a/mediaportal/MediaPortal.Application/MediaPortal.cs
+++ b/mediaportal/MediaPortal.Application/MediaPortal.cs
@@ -931,9 +931,7 @@ public class MediaPortalApp : D3D, IRender
               Log.Error("MediaPortal stopped due to an exception {0} {1} {2}", ex.Message, ex.Source, ex.StackTrace);
               _mpCrashed = true;
             }
-            app.OnExit();
           }
-
         }
         catch (Exception ex)
         {
@@ -2794,8 +2792,6 @@ public class MediaPortalApp : D3D, IRender
       _redeyedevice.Close();
     }
 
-    GUIGraphicsContext.CurrentState = GUIGraphicsContext.State.STOPPING;
-
     g_Player.Stop();
     InputDevices.Stop();
     AutoPlay.StopListening();
-- 
1.8.0.msysgit.0