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

Revert "- settings: load scan defaults before save scan.conf"

Browse Source 
This reverts commit c6847ab684faaead48d87f9100a87925dc95beec
This commit is contained in:
svenhoefer
2021-02-13 22:04:08 +01:00
committed by Thilo Graf
parent afd57c3fe1
commit d84346c352
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neutrino.cpp
View File

@@ -1374,8 +1374,6 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO; g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
configfile.setString("version_pseudo", g_settings.version_pseudo); configfile.setString("version_pseudo", g_settings.version_pseudo);
saveSetup(NEUTRINO_SETTINGS_FILE);
} }
/************************************************************************************** /**************************************************************************************

5
src/system/settings.cpp
View File

@@ -22,7 +22,6 @@
*/ */
#include <cstring> #include <cstring>
#include <unistd.h>
#include <system/settings.h> #include <system/settings.h>
#include <zapit/settings.h> #include <zapit/settings.h>
@@ -187,10 +186,6 @@ bool CScanSettings::loadSettings(const char * const fileName)
bool CScanSettings::saveSettings(const char * const fileName) bool CScanSettings::saveSettings(const char * const fileName)
{ {
// get sure we got initialized variables
if (access(fileName, R_OK) != 0)
loadSettings(fileName);
configfile.setInt32("bouquetMode", bouquetMode); configfile.setInt32("bouquetMode", bouquetMode);
configfile.setInt32("scanType", scanType); configfile.setInt32("scanType", scanType);