From dec7d42ffebf3668f00c8af7124c3b8baa470dd4 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Mon, 29 Dec 2014 21:27:44 +0100
Subject: [PATCH] - audioplayer: move videodecoder/pain away from screensaver()
 function

---
 src/gui/audioplayer.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index 08cefc6ca..f2bdb1547 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -384,6 +384,11 @@ int CAudioPlayerGui::show()
 			if (m_screensaver)
 			{
 				screensaver(false);
+
+				videoDecoder->StopPicture();
+				videoDecoder->ShowPicture(DATADIR "/neutrino/icons/mp3.jpg");
+				paint();
+
 				if (msg <= CRCInput::RC_MaxRC) {
 					// ignore first keypress - just quit the screensaver
 					g_RCInput->clearRCMsg();
@@ -706,11 +711,11 @@ int CAudioPlayerGui::show()
 			picture->exec(this, "audio");
 			delete picture;
 			pictureviewer = false;
+			screensaver(false);
 			videoDecoder->setBlank(true);
 			videoDecoder->ShowPicture(DATADIR "/neutrino/icons/mp3.jpg");
 			CVFD::getInstance()->setMode(CVFD::MODE_AUDIO);
 			paintLCD();
-			screensaver(false);
 		}
 		else if (msg == CRCInput::RC_help)
 		{
@@ -2212,9 +2217,6 @@ void CAudioPlayerGui::screensaver(bool on)
 	{
 		CScreenSaver::getInstance()->Stop();
 		m_screensaver = false;
-		videoDecoder->StopPicture();
-		videoDecoder->ShowPicture(DATADIR "/neutrino/icons/mp3.jpg");
-		paint();
 		m_idletime = time(NULL);
 	}
 }