Skip to content
Browse files

Keep slide infos during video playback.

  • Loading branch information...
1 parent 54fc0f4 commit 07611858bd8b0991b32ac01b0dc549d940be10c8 @ulion committed Apr 9, 2013
Showing with 17 additions and 14 deletions.
  1. +17 −14 xbmc/pictures/GUIWindowSlideShow.cpp
View
31 xbmc/pictures/GUIWindowSlideShow.cpp
@@ -265,22 +265,25 @@ void CGUIWindowSlideShow::OnDeinitWindow(int nextWindowID)
g_windowManager.ShowOverlay(OVERLAY_STATE_SHOWN);
- // wait for any outstanding picture loads
- if (m_pBackgroundLoader)
+ if (nextWindowID != WINDOW_FULLSCREEN_VIDEO)
{
- // sleep until the loader finishes loading the current pic
- CLog::Log(LOGDEBUG,"Waiting for BackgroundLoader thread to close");
- while (m_pBackgroundLoader->IsLoading())
- Sleep(10);
- // stop the thread
- CLog::Log(LOGDEBUG,"Stopping BackgroundLoader thread");
- m_pBackgroundLoader->StopThread();
- delete m_pBackgroundLoader;
- m_pBackgroundLoader = NULL;
+ // wait for any outstanding picture loads
+ if (m_pBackgroundLoader)
+ {
+ // sleep until the loader finishes loading the current pic
+ CLog::Log(LOGDEBUG,"Waiting for BackgroundLoader thread to close");
+ while (m_pBackgroundLoader->IsLoading())
+ Sleep(10);
+ // stop the thread
+ CLog::Log(LOGDEBUG,"Stopping BackgroundLoader thread");
+ m_pBackgroundLoader->StopThread();
+ delete m_pBackgroundLoader;
+ m_pBackgroundLoader = NULL;
+ }
+ // and close the images.
+ m_Image[0].Close();
+ m_Image[1].Close();
}
- // and close the images.
- m_Image[0].Close();
- m_Image[1].Close();
g_infoManager.ResetCurrentSlide();
CGUIWindow::OnDeinitWindow(nextWindowID);

0 comments on commit 0761185

Please sign in to comment.
Something went wrong with that request. Please try again.