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

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

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: b5dd90e3c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)
This commit is contained in:
vanhofen
2017-02-25 00:17:33 +01:00
parent ff13355b52 ea644bdb14
commit 698e9a92cd
6 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/videosettings.cpp
View File

@@ -677,6 +677,7 @@ void CVideoSettings::nextMode(void)
int curmode = 0;
int i;
bool disp_cur = 1;
int res = messages_return::none;
for (i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) {
if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key == g_settings.video_Mode) {
@@ -688,7 +689,9 @@ void CVideoSettings::nextMode(void)
while(1) {
CVFD::getInstance()->ShowText(text);
int res = ShowHint(LOCALE_VIDEOMENU_VIDEOMODE, text, 450, 2);
if (res != messages_return::cancel_info) // avoid unnecessary display of messageboxes, when user is trying to press repeated format button
res = ShowHint(LOCALE_VIDEOMENU_VIDEOMODE, text, 450, 2);
if(disp_cur && res != messages_return::handled)
break;