mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 053d97363c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-29 21:02:27 +02:00
parent e309b99543 32fa0cfdf3
commit 969d3331e4
14 changed files with 260 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/movieplayer.cpp
View File

@@ -287,7 +287,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);