From ff37c461d993702cffa0df6abff406f73461d77c Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Sat, 29 Sep 2012 14:46:43 +0400 Subject: [PATCH] gui/start_wizard.cpp: copy initial zapit settings from /var/tuxbox/config/initial/ if found Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4c41541f20fc2f521c6ffb68e6a5fa51f3d613f4 Author: [CST] Focus Date: 2012-09-29 (Sat, 29 Sep 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/start_wizard.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/gui/start_wizard.cpp b/src/gui/start_wizard.cpp index 79b7168d3..29a4ef9fe 100644 --- a/src/gui/start_wizard.cpp +++ b/src/gui/start_wizard.cpp @@ -46,6 +46,8 @@ #include "osd_setup.h" #include "osdlang_setup.h" #include "scan_setup.h" +#include +#include #include @@ -103,6 +105,17 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) res = CScanSetup::getInstance()->exec(NULL, ""); CScanSetup::getInstance()->setWizardMode(CScanSetup::SCAN_SETUP_MODE_WIZARD_NO); } + bool init_settings = file_exists("/var/tuxbox/config/initial/"); + if(init_settings && (res != menu_return::RETURN_EXIT_ALL)) + { + if (ShowMsgUTF(LOCALE_WIZARD_INITIAL_SETTINGS, g_Locale->getText(LOCALE_WIZARD_INSTALL_SETTINGS), + CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 30, false) == CMessageBox::mbrYes) { + system("/bin/cp /var/tuxbox/config/initial/* /var/tuxbox/config/zapit/"); + CFEManager::getInstance()->loadSettings(); + CFEManager::getInstance()->saveSettings(); + CZapit::getInstance()->PrepareChannels(); + } + } }