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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp
This commit is contained in:
Stefan Seyfried
2014-01-23 14:08:37 +01:00
parent 7d3843847a 3ad7175c45
commit b414474323
92 changed files with 2474 additions and 1428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/setting_helpers.cpp
View File

@@ -532,7 +532,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
/* no need to confirm if we only remove deleted channels */
if (!delete_removed) {
int result = ShowMsgUTF(msg, g_Locale->getText(LOCALE_RESET_CONFIRM), CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo);
int result = ShowMsg(msg, g_Locale->getText(LOCALE_RESET_CONFIRM), CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo);
if (result != CMessageBox::mbrYes)
return true;
}