diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-03-24 22:30:09 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-03-24 22:30:09 +0100 |
| commit | bbb4c1c61863b9032af2291bff20814733995391 (patch) | |
| tree | 3ea88d5d789e2046c88680bf6decc088f29719fd /src/gui/serverdialog.cpp | |
| parent | 096b2cd614c521db3dd5b26508ce983e50acc531 (diff) | |
| parent | a5690fa2a4cce2698225f1f558183f6fe306d860 (diff) | |
| download | mana-bbb4c1c61863b9032af2291bff20814733995391.tar.gz mana-bbb4c1c61863b9032af2291bff20814733995391.tar.bz2 mana-bbb4c1c61863b9032af2291bff20814733995391.tar.xz mana-bbb4c1c61863b9032af2291bff20814733995391.zip | |
Merge branch '0.6'
Diffstat (limited to 'src/gui/serverdialog.cpp')
| -rw-r--r-- | src/gui/serverdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 0a2b96f4..9802224b 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -78,13 +78,13 @@ ServersListModel::ServersListModel(ServerInfos *servers, ServerDialog *parent): int ServersListModel::getNumberOfElements() { - MutexLocker lock = mParent->lock(); + MutexLocker lock(mParent->getMutex()); return mServers->size(); } std::string ServersListModel::getElementAt(int elementIndex) { - MutexLocker lock = mParent->lock(); + MutexLocker lock(mParent->getMutex()); const ServerInfo &server = mServers->at(elementIndex); std::string myServer; myServer += server.hostname; |