From ce4a75caf524ecd52adb6a5b9a3740469c50bf46 Mon Sep 17 00:00:00 2001 From: James Houlahan Date: Thu, 6 Aug 2020 09:29:30 +0200 Subject: [PATCH] fix: properly decide whether it is first gui start --- internal/frontend/qt/frontend.go | 3 ++- internal/preferences/preferences.go | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/frontend/qt/frontend.go b/internal/frontend/qt/frontend.go index ff22a8c7..bcf8d439 100644 --- a/internal/frontend/qt/frontend.go +++ b/internal/frontend/qt/frontend.go @@ -316,7 +316,8 @@ func (s *FrontendQt) qtExecute(Procedure func(*FrontendQt) error) error { s.View.RootContext().SetContextProperty("go", s.Qml) // Set first start flag. - s.Qml.SetIsFirstStart(s.preferences.GetBool(preferences.FirstStartKey)) + s.Qml.SetIsFirstStart(s.preferences.GetBool(preferences.FirstStartGUIKey)) + s.preferences.SetBool(preferences.FirstStartGUIKey, false) // Check if it is first start after update (fresh version). lastVersion := s.preferences.Get(preferences.LastVersionKey) diff --git a/internal/preferences/preferences.go b/internal/preferences/preferences.go index 40ea13ea..e1767c49 100644 --- a/internal/preferences/preferences.go +++ b/internal/preferences/preferences.go @@ -29,6 +29,7 @@ import ( // Keys of preferences in JSON file. const ( FirstStartKey = "first_time_start" + FirstStartGUIKey = "first_time_start_gui" NextHeartbeatKey = "next_heartbeat" APIPortKey = "user_port_api" IMAPPortKey = "user_port_imap" @@ -47,9 +48,7 @@ type configProvider interface { GetDefaultSMTPPort() int } -var ( - log = logrus.WithField("pkg", "store") //nolint[gochecknoglobals] -) +var log = logrus.WithField("pkg", "store") //nolint[gochecknoglobals] // New returns loaded preferences with Bridge defaults when values are not set yet. func New(cfg configProvider) (pref *config.Preferences) { @@ -64,6 +63,7 @@ func New(cfg configProvider) (pref *config.Preferences) { func setDefaults(preferences *config.Preferences, cfg configProvider) { preferences.SetDefault(FirstStartKey, "true") + preferences.SetDefault(FirstStartGUIKey, "true") preferences.SetDefault(NextHeartbeatKey, strconv.FormatInt(time.Now().Unix(), 10)) preferences.SetDefault(APIPortKey, strconv.Itoa(cfg.GetDefaultAPIPort())) preferences.SetDefault(IMAPPortKey, strconv.Itoa(cfg.GetDefaultIMAPPort()))