diff options
author | Greg Frost <gregfrost1@bigpond.com> | 2009-08-15 05:32:41 (GMT) |
---|---|---|
committer | Greg Frost <gregfrost1@bigpond.com> | 2009-08-15 05:32:41 (GMT) |
commit | 620cb6800d15e6b2b0738b6cdd29080d2685f70b (patch) | |
tree | 44e096ea99d29a83c190bc2fff49569a1b00092a /abs/core-testing/mythinstall/misc_settings.cpp | |
parent | ac3fcc84dfa0692cf2b11a04d7266da47c2ff89c (diff) | |
download | linhes_pkgbuild-620cb6800d15e6b2b0738b6cdd29080d2685f70b.zip linhes_pkgbuild-620cb6800d15e6b2b0738b6cdd29080d2685f70b.tar.gz linhes_pkgbuild-620cb6800d15e6b2b0738b6cdd29080d2685f70b.tar.bz2 |
LinHES-config mythinstall: various timezone fixups
Diffstat (limited to 'abs/core-testing/mythinstall/misc_settings.cpp')
-rwxr-xr-x | abs/core-testing/mythinstall/misc_settings.cpp | 12 |
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); } |