Merge remote-tracking branch 'remotes/MediaPortal-1/MP1-4610-FEAT-AUT…

…O3D_Addendum_to_indicate_that_the_system_is_powering_off'
MediaPortal · Feb 2, 2015 · 852fc32 · 852fc32
2 parents 95b0b1c + af405b1
commit 852fc32
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/mediaportal/Core/guilib/GraphicContext.cs b/mediaportal/Core/guilib/GraphicContext.cs
@@ -917,6 +917,9 @@ public static Rectangle VideoWindow
     /// </summary>
     public static State CurrentState { get; set; }
 
+    // addendum to indicate that the system is powering off and not just rebooting
+    public static bool StoppingToPowerOff { get; set; }
+
     /// <summary>
     /// Get pointer to the applications form (needed by overlay windows)
     /// </summary>

diff --git a/mediaportal/MediaPortal.Application/MediaPortal.cs b/mediaportal/MediaPortal.Application/MediaPortal.cs
@@ -3785,7 +3785,8 @@ private void OnAction(Action action)
                   _restartOptions = RestartOptions.PowerOff;
                   _useRestartOptions = true;
                   GUIGraphicsContext.CurrentState = GUIGraphicsContext.State.STOPPING;
-                  ShuttingDown = true;
+                  GUIGraphicsContext.StoppingToPowerOff = true;
+                  ShuttingDown = true;                  
                   break;
 
                 case 1031: