1 files changed, 10 insertions, 2 deletions
diff --git a/abs/core-testing/mythinstall/misc_settings.cpp b/abs/core-testing/mythinstall/misc_settings.cpp
index ee09064..7c3eb67 100755
--- a/abs/core-testing/mythinstall/misc_settings.cpp
+++ b/abs/core-testing/mythinstall/misc_settings.cpp
@@ -113,11 +113,18 @@ QString MiscMainFrame::mf_show_tz(QString tz)
     QString GTimezone;
     int rc;
 
-    autoLaunchTimer->stop();
+    if (autoLaunchTimer->isActive())
+    {
+      autoLaunchTimer->stop();
+
+      // This was triggered by the timer. Only launch the timezone gui if the timezone is unknown.
+      if (!timezone_unknown)
+	return NULL;
+    }
 
     cout << "MiscMainFrame::mf_show_tz " << tz << "\n";
 
-    if ((tz == "") || run_from_installer)
+    if ((tz == "") || timezone_unknown)
       tz = "guess";
 
    //launch tzgui and load output into Gtimezone
@@ -152,6 +159,7 @@ QString MiscMainFrame::mf_show_tz(QString tz)
             }
             file.close();
         }
+	timezone_unknown = FALSE;
         emit update_timezone(GTimezone);
     }