projects
/
vuplus_xbmc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e6497fa
)
Allow screen saver when slideshow pausing.
author
ulion
<ulion2002@gmail.com>
Mon, 8 Apr 2013 20:20:19 +0000
(
04:20
+0800)
committer
ulion
<ulion2002@gmail.com>
Thu, 2 May 2013 11:39:46 +0000
(19:39 +0800)
xbmc/pictures/GUIWindowSlideShow.cpp
patch
|
blob
|
history
diff --git
a/xbmc/pictures/GUIWindowSlideShow.cpp
b/xbmc/pictures/GUIWindowSlideShow.cpp
index
cad5a51
..
870dd1d
100644
(file)
--- a/
xbmc/pictures/GUIWindowSlideShow.cpp
+++ b/
xbmc/pictures/GUIWindowSlideShow.cpp
@@
-385,7
+385,7
@@
void CGUIWindowSlideShow::Process(unsigned int currentTime, CDirtyRegionList &re
{
// reset the screensaver if we're in a slideshow
// (unless we are the screensaver!)
- if (m_bSlideShow && !g_application.IsInScreenSaver())
+ if (m_bSlideShow && !
m_bPause && !
g_application.IsInScreenSaver())
g_application.ResetScreenSaver();
int iSlides = m_slides->Size();
if (!iSlides) return ;