mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next

Browse Source 
Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp
This commit is contained in:
[CST] Focus
2013-03-07 17:10:57 +04:00
parent 65bd112d78 3d386649a9
commit aa60c85768
18 changed files with 407 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/update.cpp
View File

@@ -516,7 +516,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
printf("[update] calling %s %s %s\n",install_sh, g_settings.update_dir, filename.c_str() );
#else
printf("[update] calling %s %s %s\n",install_sh, g_settings.update_dir, filename.c_str() );
my_system( install_sh, g_settings.update_dir, filename.c_str() );
my_system(3, install_sh, g_settings.update_dir, filename.c_str());
#endif
showGlobalStatus(100);
ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_READY)); // UTF-8