Permalink
Browse files

Restart the idle timer after escaping from a slideshow

Fixes #11033

Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
  • Loading branch information...
chadparry authored and stuartm committed Aug 24, 2012
1 parent ab9a50c commit b86b6e1046f8646ca33c9a7f02b59a8d31300850
@@ -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();
@@ -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())

0 comments on commit b86b6e1

Please sign in to comment.