diff options
| -rw-r--r-- | tools/depends/target/ffmpeg/FFMPEG-VERSION | 2 | ||||
| -rw-r--r-- | xbmc/pictures/GUIWindowSlideShow.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION index 921cf9818e..db05e7f170 100644 --- a/tools/depends/target/ffmpeg/FFMPEG-VERSION +++ b/tools/depends/target/ffmpeg/FFMPEG-VERSION @@ -1,5 +1,5 @@ LIBNAME=ffmpeg BASE_URL=https://github.com/xbmc/FFmpeg/archive -VERSION=3.1.5-Krypton-Beta5-1 +VERSION=3.1.6-Krypton-Beta6 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz GNUTLS_VER=3.4.14 diff --git a/xbmc/pictures/GUIWindowSlideShow.cpp b/xbmc/pictures/GUIWindowSlideShow.cpp index cb15eb4092..34553e803c 100644 --- a/xbmc/pictures/GUIWindowSlideShow.cpp +++ b/xbmc/pictures/GUIWindowSlideShow.cpp @@ -266,6 +266,7 @@ void CGUIWindowSlideShow::OnDeinitWindow(int nextWindowID) m_Image[1].Close(); } g_infoManager.ResetCurrentSlide(); + m_bSlideShow = false; CGUIDialog::OnDeinitWindow(nextWindowID); } |