From 74cce5ccb2fbae2c4a6a424600b6ca4b155f2402 Mon Sep 17 00:00:00 2001
From: RickyRister <42636155+RickyRister@users.noreply.github.com>
Date: Fri, 27 Mar 2026 09:12:49 -0700
Subject: [PATCH] [SettingsManager] Properly handle multithreaded access
 (#6747)

---
 .../client/settings/card_counter_settings.cpp |  4 +++-
 .../settings/settings_manager.cpp             | 24 ++++++++++++++++---
 .../libcockatrice/settings/settings_manager.h |  5 +++-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/cockatrice/src/client/settings/card_counter_settings.cpp b/cockatrice/src/client/settings/card_counter_settings.cpp
index 71ce4cfc6..399365c99 100644
--- a/cockatrice/src/client/settings/card_counter_settings.cpp
+++ b/cockatrice/src/client/settings/card_counter_settings.cpp
@@ -11,6 +11,8 @@ CardCounterSettings::CardCounterSettings(const QString &settingsPath, QObject *p
 
 void CardCounterSettings::setColor(int counterId, const QColor &color)
 {
+    QSettings settings = getSettings();
+
     QString key = QString("cards/counters/%1/color").arg(counterId);
 
     if (settings.value(key).value<QColor>() == color)
@@ -36,7 +38,7 @@ QColor CardCounterSettings::color(int counterId) const
         defaultColor = QColor::fromHsv(h, s, v);
     }
 
-    return settings.value(QString("cards/counters/%1/color").arg(counterId), defaultColor).value<QColor>();
+    return getSettings().value(QString("cards/counters/%1/color").arg(counterId), defaultColor).value<QColor>();
 }
 
 QString CardCounterSettings::displayName(int counterId) const
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp b/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
index ede5a2027..3f3deb638 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
@@ -1,16 +1,22 @@
 #include "settings_manager.h"
 
-SettingsManager::SettingsManager(const QString &settingPath,
+SettingsManager::SettingsManager(const QString &_settingPath,
                                  const QString &_defaultGroup,
                                  const QString &_defaultSubGroup,
                                  QObject *parent)
-    : QObject(parent), settings(settingPath, QSettings::IniFormat), defaultGroup(_defaultGroup),
-      defaultSubGroup(_defaultSubGroup)
+    : QObject(parent), settingPath(_settingPath), defaultGroup(_defaultGroup), defaultSubGroup(_defaultSubGroup)
 {
 }
 
+QSettings SettingsManager::getSettings() const
+{
+    return QSettings(settingPath, QSettings::IniFormat);
+}
+
 void SettingsManager::setValue(const QVariant &value, const QString &name)
 {
+    auto settings = getSettings();
+
     if (!defaultGroup.isEmpty()) {
         settings.beginGroup(defaultGroup);
     }
@@ -35,6 +41,8 @@ void SettingsManager::setValue(const QVariant &value,
                                const QString &group,
                                const QString &subGroup)
 {
+    auto settings = getSettings();
+
     if (!group.isEmpty()) {
         settings.beginGroup(group);
     }
@@ -56,6 +64,8 @@ void SettingsManager::setValue(const QVariant &value,
 
 void SettingsManager::deleteValue(const QString &name)
 {
+    auto settings = getSettings();
+
     if (!defaultGroup.isEmpty()) {
         settings.beginGroup(defaultGroup);
     }
@@ -77,6 +87,8 @@ void SettingsManager::deleteValue(const QString &name)
 
 void SettingsManager::deleteValue(const QString &name, const QString &group, const QString &subGroup)
 {
+    auto settings = getSettings();
+
     if (!group.isEmpty()) {
         settings.beginGroup(group);
     }
@@ -98,6 +110,8 @@ void SettingsManager::deleteValue(const QString &name, const QString &group, con
 
 QVariant SettingsManager::getValue(const QString &name)
 {
+    auto settings = getSettings();
+
     if (!defaultGroup.isEmpty()) {
         settings.beginGroup(defaultGroup);
     }
@@ -121,6 +135,8 @@ QVariant SettingsManager::getValue(const QString &name)
 
 QVariant SettingsManager::getValue(const QString &name, const QString &group, const QString &subGroup)
 {
+    auto settings = getSettings();
+
     if (!group.isEmpty()) {
         settings.beginGroup(group);
     }
@@ -147,5 +163,7 @@ QVariant SettingsManager::getValue(const QString &name, const QString &group, co
  */
 void SettingsManager::sync()
 {
+    auto settings = getSettings();
+
     settings.sync();
 }
\ No newline at end of file
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_manager.h b/libcockatrice_settings/libcockatrice/settings/settings_manager.h
index 3592d8f8c..18abb8dbf 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_manager.h
+++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.h
@@ -24,9 +24,12 @@ public:
     void sync();
 
 protected:
-    QSettings settings;
+    QString settingPath;
     QString defaultGroup;
     QString defaultSubGroup;
+
+    QSettings getSettings() const;
+
     void setValue(const QVariant &value, const QString &name);
     void
     setValue(const QVariant &value, const QString &name, const QString &group, const QString &subGroup = QString());