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

neutrino.cpp: add updates check on boot;

Browse Source 
init channel lists before warning about 'new settings are set to defaults' - fix crash,
if ie EVT_PROGRAMLOCKSTATUS received while dialog on the screen, and channel list not exists
This commit is contained in:
[CST] Focus
2014-10-20 14:23:31 +04:00
parent c43438baec
commit 2470086d93
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/neutrino.cpp
View File

@@ -85,6 +85,7 @@
#include "gui/sleeptimer.h" #include "gui/sleeptimer.h"
#include "gui/start_wizard.h" #include "gui/start_wizard.h"
#include "gui/update_ext.h" #include "gui/update_ext.h"
#include "gui/update.h"
#include "gui/videosettings.h" #include "gui/videosettings.h"
#include "gui/audio_select.h" #include "gui/audio_select.h"
@@ -338,9 +339,12 @@ int CNeutrinoApp::loadSetup(const char * fname)
checkParentallocked.close(); checkParentallocked.close();
} }
g_settings.easymenu = configfile.getInt32("easymenu", 0); g_settings.easymenu = configfile.getInt32("easymenu", 0);
g_settings.softupdate_autocheck = configfile.getBool("softupdate_autocheck" , false);
/* if file present and no config file found, force easy mode */ /* if file present and no config file found, force easy mode */
if (erg && !access("/var/etc/.easymenu", F_OK)) if (erg && !access("/var/etc/.easymenu", F_OK)) {
g_settings.easymenu = 1; g_settings.easymenu = 1;
g_settings.softupdate_autocheck = 1;
}
dprintf(DEBUG_NORMAL, "g_settings.easymenu %d\n", g_settings.easymenu); dprintf(DEBUG_NORMAL, "g_settings.easymenu %d\n", g_settings.easymenu);
// video // video
@@ -1168,6 +1172,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setString("softupdate_url_file" , g_settings.softupdate_url_file ); configfile.setString("softupdate_url_file" , g_settings.softupdate_url_file );
configfile.setInt32 ("softupdate_name_mode_apply", g_settings.softupdate_name_mode_apply); configfile.setInt32 ("softupdate_name_mode_apply", g_settings.softupdate_name_mode_apply);
configfile.setInt32 ("softupdate_name_mode_backup", g_settings.softupdate_name_mode_backup); configfile.setInt32 ("softupdate_name_mode_backup", g_settings.softupdate_name_mode_backup);
configfile.setBool("softupdate_autocheck", g_settings.softupdate_autocheck);
configfile.setInt32("flashupdate_createimage_add_uldr", g_settings.flashupdate_createimage_add_uldr); configfile.setInt32("flashupdate_createimage_add_uldr", g_settings.flashupdate_createimage_add_uldr);
configfile.setInt32("flashupdate_createimage_add_u_boot", g_settings.flashupdate_createimage_add_u_boot); configfile.setInt32("flashupdate_createimage_add_u_boot", g_settings.flashupdate_createimage_add_u_boot);
@@ -2009,6 +2014,7 @@ TIMER_START();
startwizard.exec(NULL, ""); startwizard.exec(NULL, "");
} }
InitZapper();
if(loadSettingsErg) { if(loadSettingsErg) {
hintBox->hide(); hintBox->hide();
dprintf(DEBUG_INFO, "config file or options missing\n"); dprintf(DEBUG_INFO, "config file or options missing\n");
@@ -2023,7 +2029,7 @@ TIMER_START();
delete hdd; delete hdd;
cCA::GetInstance()->Ready(true); cCA::GetInstance()->Ready(true);
InitZapper(); //InitZapper();
SHTDCNT::getInstance()->init(); SHTDCNT::getInstance()->init();
@@ -2034,6 +2040,17 @@ TIMER_START();
cHddStat::getInstance(); cHddStat::getInstance();
TIMER_STOP("################################## after all ##################################"); TIMER_STOP("################################## after all ##################################");
if (g_settings.softupdate_autocheck) {
hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET));
hintBox->paint();
CFlashUpdate flash;
if(flash.checkOnlineVersion()) {
hintBox->hide();
//flash.enableNotify(false);
flash.exec(NULL, "inet");
}
delete hintBox;
}
RealRun(personalize.getWidget(0)/**main**/); RealRun(personalize.getWidget(0)/**main**/);
ExitRun(true, (cs_get_revision() > 7)); ExitRun(true, (cs_get_revision() > 7));