From 06d0205bab253ec5d01e8483ab639a092fe117c5 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 5 Dec 2008 22:26:38 +0100
Subject: Fixed MutexLocker to not work on a copy

The Mutex class wasn't meant to be copied around. Silly last minute
refactorings leading to untested code...
---
 src/gui/updatewindow.cpp |  4 ++--
 src/utils/mutex.h        | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 6083725e..c0344b72 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -164,7 +164,7 @@ void UpdaterWindow::setProgress(float p)
 void UpdaterWindow::setLabel(const std::string &str)
 {
     // Do delayed label text update, since Guichan isn't thread-safe
-    MutexLocker lock(mLabelMutex);
+    MutexLocker lock(&mLabelMutex);
     mNewLabelCaption = str;
 }
 
@@ -410,7 +410,7 @@ void UpdaterWindow::logic()
 
     // Synchronize label caption when necessary
     {
-        MutexLocker lock(mLabelMutex);
+        MutexLocker lock(&mLabelMutex);
 
         if (mLabel->getCaption() != mNewLabelCaption)
         {
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index 6c35987c..62c6b4e1 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -40,6 +40,9 @@ public:
     void unlock();
 
 private:
+    Mutex(const Mutex&);  // prevent copying
+    Mutex& operator=(const Mutex&);
+
     SDL_mutex *mMutex;
 };
 
@@ -49,11 +52,11 @@ private:
 class MutexLocker
 {
 public:
-    MutexLocker(Mutex mutex);
+    MutexLocker(Mutex *mutex);
     ~MutexLocker();
 
 private:
-    Mutex mMutex;
+    Mutex *mMutex;
 };
 
 
@@ -80,15 +83,15 @@ inline void Mutex::unlock()
 }
 
 
-inline MutexLocker::MutexLocker(Mutex mutex):
+inline MutexLocker::MutexLocker(Mutex *mutex):
     mMutex(mutex)
 {
-    mMutex.lock();
+    mMutex->lock();
 }
 
 inline MutexLocker::~MutexLocker()
 {
-    mMutex.unlock();
+    mMutex->unlock();
 }
 
 #endif // TMW_MUTEX_H
-- 
cgit v1.2.3-70-g09d2