summaryrefslogtreecommitdiff
path: root/src/gui/serverdialog.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-18 23:23:11 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-18 23:23:11 +0300
commit7dc7b217107d18d531c569d2deab6ff1f62552d5 (patch)
tree30753ed34988d26d86733c9d76b97c7b6d24a998 /src/gui/serverdialog.cpp
parentdc6568962a32ddb6f231c629e7ad3373e9086b6c (diff)
downloadmv-7dc7b217107d18d531c569d2deab6ff1f62552d5.tar.gz
mv-7dc7b217107d18d531c569d2deab6ff1f62552d5.tar.bz2
mv-7dc7b217107d18d531c569d2deab6ff1f62552d5.tar.xz
mv-7dc7b217107d18d531c569d2deab6ff1f62552d5.zip
fix name conflicts.
Diffstat (limited to 'src/gui/serverdialog.cpp')
-rw-r--r--src/gui/serverdialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index d30c995aa..17d299772 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -826,7 +826,7 @@ int ServerDialog::downloadUpdate(void *ptr, DownloadStatus status,
else if (progress > 1.0f)
progress = 1.0f;
- MutexLocker lock(&sd->mMutex);
+ MutexLocker lock1(&sd->mMutex);
sd->mDownloadStatus = DOWNLOADING_IN_PROGRESS;
sd->mDownloadProgress = progress;
}
@@ -834,7 +834,7 @@ int ServerDialog::downloadUpdate(void *ptr, DownloadStatus status,
if (finished)
{
sd->loadServers();
- MutexLocker lock(&sd->mMutex);
+ MutexLocker lock1(&sd->mMutex);
sd->mDownloadStatus = DOWNLOADING_COMPLETE;
}