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

Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale


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



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-29 08:05:10 +02:00
parent f867d99444 3a34afe94e
commit 1a928cce60
14 changed files with 258 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/movieplayer.cpp
View File

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