From 6ee7c616676adbd72dee31ec29469d34eecb0ca1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 15 Dec 2015 19:32:42 +0100
Subject: [PATCH] CSMPrefs: fix deadlock in toColor()

---
 apps/opencs/model/prefs/setting.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/prefs/setting.cpp b/apps/opencs/model/prefs/setting.cpp
index 89924ae29..75b58322d 100644
--- a/apps/opencs/model/prefs/setting.cpp
+++ b/apps/opencs/model/prefs/setting.cpp
@@ -71,7 +71,7 @@ bool CSMPrefs::Setting::isTrue() const
 
 QColor CSMPrefs::Setting::toColor() const
 {
-    QMutexLocker lock (mMutex);
+    // toString() handles lock
     return QColor (QString::fromUtf8 (toString().c_str()));
 }