Fixup for #548: fix detection of portable app

Don't call getHomeDir() in global constructor before main()
chris2511 · Sep 8, 2024 · 418b78c · 418b78c
1 parent d256da3
commit 418b78c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 20 deletions.
diff --git a/lib/func.cpp b/lib/func.cpp
@@ -117,6 +117,7 @@ static QString registryInstallDir()
 int portable_app()
 {
 	static int portable = -1;
+	qDebug() << "portable" << portable;
 	QString f1, f2;
 	if (portable == -1) {
 #if defined(Q_OS_WIN32)

diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -28,6 +28,7 @@ QString svalue::get() const
 {
 	return setting ? setting->get(key) : QString();
 }
+
 void svalue::set(const QString &val)
 {
 	if (setting)
@@ -36,31 +37,37 @@ void svalue::set(const QString &val)
 
 settings::settings()
 {
-	defaul["mandatory_dn"] = "";
-	defaul["explicit_dn"] = "C,ST,L,O,OU,CN,emailAddress";
-	defaul["string_opt"] = "MASK:0x2002";
-	defaul["workingdir"] = getHomeDir() + "/";
-	defaul["default_hash"] = digest::getDefault().name();
-	defaul["pkcs12_enc_algo"] = encAlgo::getDefault().name();
-	defaul["ical_expiry"] = "1W";
-	defaul["cert_expiry"] = "80%";
-	defaul["serial_len"] = "64";
-	defaul["fp_separator"] = ":";
-	defaul["fp_digits"] = "2";
-	defaul["hide_unusable"] = "no";
-	defaul["KeyFormat"] = QString::number(DEFAULT_KEY_CLIPBOARD_TYPE);
-	defaul["CertFormat"] = QString::number(DEFAULT_CERT_CLIPBOARD_TYPE);
-
-	hostspecific << "pkcs11path" << "workingdir" << "mw_geometry";
+	hostspecific = QStringList({ "pkcs11path", "workingdir", "mw_geometry" });
+}
+
+const QMap<QString, QString> settings::defaults() const
+{
+	return QMap<QString, QString> {
+		{ "mandatory_dn", "" },
+		{ "explicit_dn", "C,ST,L,O,OU,CN,emailAddress" },
+		{ "string_opt", "MASK:0x2002" },
+		{ "workingdir", getHomeDir() + "/" },
+		{ "default_hash", digest::getDefault().name() },
+		{ "pkcs12_enc_algo", encAlgo::getDefault().name() },
+		{ "ical_expiry", "1W" },
+		{ "cert_expiry", "80%" },
+		{ "serial_len", "64" },
+		{ "fp_separator", ":" },
+		{ "fp_digits", "2" },
+		{ "hide_unusable", "no" },
+		{ "KeyFormat", QString::number(DEFAULT_KEY_CLIPBOARD_TYPE) },
+		{ "CertFormat", QString::number(DEFAULT_CERT_CLIPBOARD_TYPE) },
+	};
 }
 
 void settings::clear()
 {
 	loaded = false;
 	values.clear();
 	db_keys.clear();
-	foreach(QString key, defaul.keys())
-		setAction(key, defaul[key]);
+	const QMap<QString, QString> def = defaults();
+	for(QString key : def.keys())
+		setAction(key, def[key]);
 }
 
 void settings::setAction(const QString &key, const QString &value)
@@ -93,7 +100,7 @@ void settings::setAction(const QString &key, const QString &value)
 
 QString settings::defaults(const QString &key)
 {
-	return defaul[key];
+	return defaults()[key];
 }
 
 void settings::load_settings()

diff --git a/lib/settings.h b/lib/settings.h
@@ -95,11 +95,11 @@ class settings
 	bool loaded{};
 	QStringList db_keys{}, hostspecific{};
 	QMap<QString, QString> values{};
-	QMap<QString, QString> defaul{};
 	void load_settings();
 	QString get(QString key);
 	void set(QString key, QString value);
 	void setAction(const QString &key, const QString &value);
+	const QMap<QString, QString> defaults() const;
 
   public:
 	settings();