From fc753ffd39357f49035fc14a30b299227208ead4 Mon Sep 17 00:00:00 2001 From: Elliott Liggett Date: Tue, 17 Jan 2023 21:13:16 -0800 Subject: [PATCH] cleanup of prefs --- prefs.h | 4 ++-- wfmain.cpp | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/prefs.h b/prefs.h index 9b2a669..9b60d24 100644 --- a/prefs.h +++ b/prefs.h @@ -60,8 +60,8 @@ struct preferences { QString clusterTcpServerName; QString clusterTcpUserName; QString clusterTcpPassword; - int clusterTimeout; - bool clusterSkimmerSpotsEnable; + int clusterTimeout; // used? + bool clusterSkimmerSpotsEnable; // where is this used? }; #endif // PREFS_H diff --git a/wfmain.cpp b/wfmain.cpp index ef3aaf6..454ddd6 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -2439,15 +2439,20 @@ void wfmain::saveSettings() qInfo(logSystem()) << "Saving settings to " << settings->fileName(); // Basic things to load: - QString versionstr = QString(WFVIEW_VERSION); - QString majorVersion = versionstr.split(".").at(0); - QString minorVersion = versionstr.split(".").at(1); + QString versionstr = QString(WFVIEW_VERSION); + QString majorVersion = "-1"; + QString minorVersion = "-1"; + if(versionstr.contains(".") && (versionstr.split(".").length() == 2)) + { + majorVersion = versionstr.split(".").at(0); + minorVersion = versionstr.split(".").at(1); + } settings->beginGroup("Program"); settings->setValue("version", versionstr); - settings->setValue("majorVersion", int(majorVersion.toInt()); - settings->setValue("minorVersion", int(minorVersion.toInt()); + settings->setValue("majorVersion", int(majorVersion.toInt())); + settings->setValue("minorVersion", int(minorVersion.toInt())); settings->setValue("gitShort", QString(GITSHORT)); settings->endGroup();