From b612c1f620c00e628d1cafc854d01e59753e2ba5 Mon Sep 17 00:00:00 2001
From: "M. Liebmann" <git@tuxcode.de>
Date: Tue, 28 Mar 2017 23:55:16 +0200
Subject: [PATCH] Fix videosystem auto mode

---
 src/gui/movieplayer.cpp | 4 +++-
 src/neutrino.cpp        | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 9f1eb5862..9b9590d99 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -257,7 +257,9 @@ void CMoviePlayerGui::restoreNeutrino()
 		return;
 
 #ifdef ENABLE_CHANGE_OSD_RESOLUTION
-	if ((currentVideoSystem > -1) && (g_settings.video_Mode == VIDEO_STD_AUTO)) {
+	if ((currentVideoSystem > -1) &&
+	    (g_settings.video_Mode == VIDEO_STD_AUTO) &&
+	    (g_settings.enabled_auto_modes[currentVideoSystem] == 1)) {
 		COsdHelpers *coh = COsdHelpers::getInstance();
 		if (currentVideoSystem != coh->getVideoSystem()) {
 			coh->setVideoSystem(currentVideoSystem, false);
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index a37a4d3df..3bba42f54 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2995,7 +2995,8 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
 		printf(">>>>>[CNeutrinoApp::%s:%d] Receive EVT_AUTO_SET_VIDEOSYSTEM message\n", __func__, __LINE__);
 		COsdHelpers *coh = COsdHelpers::getInstance();
 		int videoSystem = (int)data;
-		if (coh->getVideoSystem() != videoSystem) {
+		if ((videoSystem != -1) /* -1 => not enabled for automode */ &&
+		    (coh->getVideoSystem() != videoSystem)) {
 			coh->setVideoSystem(videoSystem, false);
 			if (frameBufferInitialized)
 				coh->changeOsdResolution(0, true, false);