add check-live-ci (thx DboxOldie)

Conflicts:
	src/gui/cam_menu.cpp
This commit is contained in:
max10
2016-07-08 12:20:41 +02:00
committed by Thilo Graf
parent 0feb693cf1
commit 75e7bc7b28
7 changed files with 48 additions and 10 deletions

View File

@@ -468,6 +468,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
#endif
g_settings.ci_ignore_messages = configfile.getInt32("ci_ignore_messages", 0);
g_settings.ci_save_pincode = configfile.getInt32("ci_save_pincode", 0);
g_settings.ci_check_live = configfile.getInt32("ci_check_live", 0);
g_settings.ci_pincode = configfile.getString("ci_pincode", "");
g_settings.ci_tuner = configfile.getInt32("ci_tuner", -1);
g_settings.ci_rec_zapto = configfile.getInt32("ci_rec_zapto", 0);
@@ -1394,6 +1395,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32("ci_clock", g_settings.ci_clock);
configfile.setInt32("ci_ignore_messages", g_settings.ci_ignore_messages);
configfile.setInt32("ci_save_pincode", g_settings.ci_save_pincode);
configfile.setInt32("ci_check_live", g_settings.ci_check_live);
configfile.setString("ci_pincode", g_settings.ci_pincode);
configfile.setInt32("ci_tuner", g_settings.ci_tuner);
configfile.setInt32("ci_rec_zapto", g_settings.ci_rec_zapto);
@@ -2829,6 +2831,7 @@ TIMER_START();
delete hintBox;
cCA::GetInstance()->Ready(true);
cCA::GetInstance()->setCheckLiveSlot(g_settings.ci_check_live);
//InitZapper();
SHTDCNT::getInstance()->init();