Fix videosystem auto mode

Origin commit data
------------------
Branch: ni/coolstream
Commit: b612c1f620
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-03-28 23:55:16 +02:00
parent 8090c48f2f
commit 3a34afe94e
2 changed files with 5 additions and 2 deletions

View File

@@ -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);

View File

@@ -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);