From 7dc7b217107d18d531c569d2deab6ff1f62552d5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 18 Sep 2013 23:23:11 +0300
Subject: fix name conflicts.

---
 src/gui/serverdialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/gui/serverdialog.cpp')

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;
     }
 
-- 
cgit v1.2.3-70-g09d2