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

setting_helpers: suplement to "setting_helpers: reduce dub code parts"

Browse Source 
Init of zone was incomplete
This commit is contained in:
Thilo Graf
2023-05-07 11:42:07 +02:00
parent 6ef0bd0f90
commit b06321104d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/system/setting_helpers.cpp
View File

@@ -61,6 +61,7 @@
#include <driver/volume.h>
#include <system/helpers.h>
#include <system/debug.h>
#include <gui/widget/msgbox.h>
#include <gui/widget/hintbox.h>
@@ -579,9 +580,9 @@ std::string CNetAdapter::getMacAddr(void)
bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void *Data)
{
bool found = false;
std::string name, zone;
std::string name, zoneinfo, zone;
zoneinfo = TARGET_PREFIX "/share/zoneinfo/";
printf("CTZChangeNotifier::changeNotify: %s\n", (char *) Data);
std::string zoneinfo = TARGET_PREFIX "/share/zoneinfo/" + zone;
xmlDocPtr parser = parseXmlFile("/etc/timezone.xml");
if (parser != NULL)
@@ -601,10 +602,11 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void *Data)
const char *zptr = xmlGetAttribute(search, "zone");
if (zptr)
zone = zptr;
if (!access(zoneinfo.c_str(), R_OK))
std::string Zone = zoneinfo + zone;
if (!access(Zone.c_str(), R_OK))
found = true;
else
dprintf(DEBUG_NORMAL, "[CTZChangeNotifier] [%s - %d] %s not found\n", __func__, __LINE__, zoneinfo.c_str());
dprintf(DEBUG_NORMAL, "[CTZChangeNotifier] [%s - %d] %s not found\n", __func__, __LINE__, Zone.c_str());
break;
}
}
@@ -615,7 +617,7 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void *Data)
if (found)
{
printf("Timezone: %s -> %s\n", name.c_str(), zone.c_str());
std::string cmd = zoneinfo;
std::string cmd = zoneinfo + zone;
printf("symlink %s to /etc/localtime\n", cmd.c_str());
if (unlink("/etc/localtime"))
perror("unlink failed");