summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-05 22:26:38 +0100
committerIra Rice <irarice@gmail.com>2008-12-05 15:55:31 -0700
commit032f7659014d265a3c34765da2f277b7b0f32691 (patch)
tree2ac9b405c6d820dab72b8c5810127cf0cf46e25d /src/gui
parent7d5bfc11b5e467b502a3b56e853200b887859808 (diff)
downloadmana-032f7659014d265a3c34765da2f277b7b0f32691.tar.gz
mana-032f7659014d265a3c34765da2f277b7b0f32691.tar.bz2
mana-032f7659014d265a3c34765da2f277b7b0f32691.tar.xz
mana-032f7659014d265a3c34765da2f277b7b0f32691.zip
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...
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/updatewindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 9d9f5616..1097f072 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -163,7 +163,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;
}
@@ -423,7 +423,7 @@ void UpdaterWindow::logic()
// Synchronize label caption when necessary
{
- MutexLocker lock(mLabelMutex);
+ MutexLocker lock(&mLabelMutex);
if (mLabel->getCaption() != mNewLabelCaption)
{