Add mutex for saving

kraxarn · Jun 2, 2020 · 1bdf686 · 1bdf686
1 parent 3c3d7c5
commit 1bdf686
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
 		auto jsonData = settings.legacyToJson().toJson();
 		jsonFile.write(jsonData);
 		jsonFile.close();
-		settings = Settings();
+		settings.load();
 	}
 	// Check fallback icons
 	Icon::useFallbackIcons = settings.general.fallbackIcons;

diff --git a/src/settings.cpp b/src/settings.cpp
@@ -77,8 +77,10 @@ void Settings::load()
 	spotify.bitrate = s["bitrate"].toInt(320);
 }
 
-void Settings::save() const
+void Settings::save()
 {
+	mutex.lock();
+
 	QJsonArray jsonHiddenSongHeaders;
 	for (auto &val : general.hiddenSongHeaders)
 		jsonHiddenSongHeaders.append(val);
@@ -123,6 +125,7 @@ void Settings::save() const
 	file.open(QIODevice::WriteOnly);
 	file.write(QJsonDocument(json).toJson(QJsonDocument::Indented));
 	file.close();
+	mutex.unlock();
 }
 
 QJsonDocument Settings::legacyToJson()

diff --git a/src/settings.hpp b/src/settings.hpp
@@ -9,6 +9,7 @@
 #include <QFile>
 #include <QStandardPaths>
 #include <QDebug>
+#include <QMutex>
 
 class Settings
 {
@@ -17,7 +18,8 @@ class Settings
 	virtual ~Settings();
 
 	QJsonDocument legacyToJson();
-	void save() const;
+	void save();
+	void load();
 
 	enum Palette
 	{
@@ -87,9 +89,7 @@ class Settings
 	bool sptGlobalConfig();
 	bool fixedWidthTime();
 
-	void load();
-
 	static Settings *set;
-
 	QSettings *settings;
+	QMutex mutex;
 };