Continue fix for shadow variables/methods errors.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 763c190d6..f9d6ebfd0 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -548,7 +548,7 @@ void ServerDialog::mouseClicked(gcn::MouseEvent &mouseEvent)
 void ServerDialog::logic()
 {
     {
-        MutexLocker lock(&mMutex);
+        MutexLocker tempLock(&mMutex);
         if (mDownloadStatus == DOWNLOADING_COMPLETE)
         {
             mDownloadStatus = DOWNLOADING_OVER;
@@ -636,11 +636,11 @@ void ServerDialog::loadServers(bool addNew)
         return;
     }
 
-    int version = XML::getProperty(rootNode, "version", 0);
-    if (version != 1)
+    int ver = XML::getProperty(rootNode, "version", 0);
+    if (ver != 1)
     {
         logger->log("Error: unsupported online server list version: %d",
-                    version);
+                    ver);
         return;
     }
 
@@ -703,7 +703,7 @@ void ServerDialog::loadServers(bool addNew)
         server.version.first = gui->getFont()->getWidth(version);
         server.version.second = version;
 
-        MutexLocker lock(&mMutex);
+        MutexLocker tempLock(&mMutex);
         // Add the server to the local list if it's not already present
         bool found = false;
         for (unsigned int i = 0; i < mServers.size(); i++)