Restart the idle timer after escaping from a slideshow

Fixes #11033 Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
MythTV · Aug 27, 2012 · b86b6e1 · b86b6e1
1 parent ab9a50c
commit b86b6e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/mythplugins/mythgallery/mythgallery/glsingleview.cpp b/mythplugins/mythgallery/mythgallery/glsingleview.cpp
@@ -155,6 +155,12 @@ void GLSingleView::CleanUp(void)
 {
     makeCurrent();
 
+    if (m_slideshow_running)
+    {  
+        GetMythMainWindow()->PauseIdleTimer(false);
+        GetMythUI()->RestoreScreensaver();
+    }
+
     if (m_slideshow_timer)
     {
         m_slideshow_timer->stop();

diff --git a/mythplugins/mythgallery/mythgallery/singleview.cpp b/mythplugins/mythgallery/mythgallery/singleview.cpp
@@ -148,6 +148,12 @@ SingleView::SingleView(
 
 SingleView::~SingleView()
 {
+    if (m_slideshow_running)
+    {
+        GetMythMainWindow()->PauseIdleTimer(false);
+        GetMythUI()->RestoreScreensaver();
+    }
+
     if (m_effect_painter)
     {
         if (m_effect_painter->isActive())