diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-09-09 22:10:53 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-09-09 22:11:30 +0300 |
commit | 703a3c4df3732e3e88559147001260f3355d42d6 (patch) | |
tree | fcaf8919cf734429374e4bb9a83b2b4a33835d1d /src/gui/serverdialog.cpp | |
parent | 3a875a0026936d4bcb3bd1c2b6e8ac547cd5e27e (diff) | |
download | manaplus-703a3c4df3732e3e88559147001260f3355d42d6.tar.gz manaplus-703a3c4df3732e3e88559147001260f3355d42d6.tar.bz2 manaplus-703a3c4df3732e3e88559147001260f3355d42d6.tar.xz manaplus-703a3c4df3732e3e88559147001260f3355d42d6.zip |
Continue fix for shadow variables/methods errors.
Diffstat (limited to 'src/gui/serverdialog.cpp')
-rw-r--r-- | src/gui/serverdialog.cpp | 10 |
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++) |