From 7e78f2196d7f255414109a99678fcd602f85c6d5 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 1 May 2023 22:54:02 +0200
Subject: [PATCH] Revert "setting_helpers: reduce dub code parts"

This reverts commit 34070f9c24c06586929a83015cc08d8b49e7bf65 because zone was uninitialized while zoneinfo was initialized.


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/5e44b0a1a856c67acb619a93d761939006ea07f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-05-01 (Mon, 01 May 2023)



------------------
This commit was generated by Migit
---
 src/system/setting_helpers.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index 29bdf9844..dab1943ac 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -64,7 +64,7 @@
 #include <driver/display.h>
 #include <driver/volume.h>
 #include <system/helpers.h>
-#include <system/debug.h>
+
 #include <gui/widget/msgbox.h>
 #include <gui/widget/hintbox.h>
 
@@ -619,7 +619,6 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void *Data)
 	bool found = false;
 	std::string name, zone;
 	printf("CTZChangeNotifier::changeNotify: %s\n", (char *) Data);
-	std::string zoneinfo = TARGET_PREFIX "/share/zoneinfo/" + zone;
 
 	xmlDocPtr parser = parseXmlFile("/etc/timezone.xml");
 	if (parser != NULL)
@@ -639,10 +638,8 @@ 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))
+					if (!access(TARGET_PREFIX "/share/zoneinfo/" + zone, R_OK))
 						found = true;
-					else
-						dprintf(DEBUG_NORMAL, "[CTZChangeNotifier] [%s - %d] %s not found\n", __func__, __LINE__, zoneinfo.c_str());
 					break;
 				}
 			}
@@ -653,7 +650,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 = TARGET_PREFIX "/share/zoneinfo/" + zone;
 		printf("symlink %s to /etc/localtime\n", cmd.c_str());
 		if (unlink("/etc/localtime"))
 			perror("unlink failed");