summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-04 01:35:26 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-04 01:35:26 +0300
commit787caddc0074df0b3fb217bad561be8fd71ca5b9 (patch)
tree2a01a3b67e17150bf6f0ddf25f8da1323c447573
parentbb2b168a1b4ce9cb471157dd688f4b450a905a0e (diff)
downloadmanaverse-787caddc0074df0b3fb217bad561be8fd71ca5b9.tar.gz
manaverse-787caddc0074df0b3fb217bad561be8fd71ca5b9.tar.bz2
manaverse-787caddc0074df0b3fb217bad561be8fd71ca5b9.tar.xz
manaverse-787caddc0074df0b3fb217bad561be8fd71ca5b9.zip
Fix possible crash in server dialog if close manaplus in wrong time.
-rw-r--r--src/gui/windows/serverdialog.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 7c4af2291..a86fa0b1e 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -391,6 +391,7 @@ void ServerDialog::logic()
MutexLocker tempLock(&mMutex);
if (mDownloadStatus == ServerDialogDownloadStatus::COMPLETE)
{
+ loadServers();
mDownloadStatus = ServerDialogDownloadStatus::OVER;
mDescription->setCaption(std::string());
}
@@ -783,7 +784,6 @@ int ServerDialog::downloadUpdate(void *ptr,
if (finished)
{
- sd->loadServers();
MutexLocker lock1(&sd->mMutex);
sd->mDownloadStatus = ServerDialogDownloadStatus::COMPLETE;
}