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

Merge branch 'check/next-cc'

Browse Source 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
This commit is contained in:
Stefan Seyfried
2013-07-06 19:01:15 +02:00
parent 7ceb15984f e42b31e4a9
commit 6830b68cac
91 changed files with 5546 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/update.cpp
View File

@@ -466,8 +466,10 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
#if ENABLE_EXTUPDATE
if (g_settings.apply_settings) {
if (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_APPLY_SETTINGS), CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_UPDATE) == CMessageBox::mbrYes)
if (!CExtUpdate::getInstance()->applySettings(filename, CExtUpdate::MODE_SOFTUPDATE))
if (!CExtUpdate::getInstance()->applySettings(filename, CExtUpdate::MODE_SOFTUPDATE)) {
hide();
return menu_return::RETURN_REPAINT;
}
}
#endif