Permalink
Browse files

gui: make sure we leave fullscreen if we start a player without media

  • Loading branch information...
1 parent 7d5599d commit 9f1f356f9e49f1496db1d01c317e5e8f3680cef9 @elupus committed Oct 29, 2012
Showing with 8 additions and 1 deletion.
  1. +8 −1 xbmc/Application.cpp
View
@@ -4142,7 +4142,7 @@ bool CApplication::PlayFile(const CFileItem& item, bool bRestart)
}
#ifdef HAS_VIDEO_PLAYBACK
- if( IsPlayingVideo() )
+ else if( IsPlayingVideo() )
{
if (g_windowManager.GetActiveWindow() == WINDOW_VISUALISATION)
g_windowManager.ActivateWindow(WINDOW_FULLSCREEN_VIDEO);
@@ -4171,6 +4171,13 @@ bool CApplication::PlayFile(const CFileItem& item, bool bRestart)
}
}
#endif
+ else
+ {
+ if (g_windowManager.GetActiveWindow() == WINDOW_VISUALISATION
+ || g_windowManager.GetActiveWindow() == WINDOW_FULLSCREEN_VIDEO)
+ g_windowManager.PreviousWindow();
+
+ }
#if !defined(TARGET_DARWIN) && !defined(_LINUX)
g_audioManager.Enable(false);

0 comments on commit 9f1f356

Please sign in to comment.