summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-28 21:25:30 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-28 21:26:05 +0300
commitc3f8a2808ea38f8ebd05408c19d2fafedcdd126b (patch)
tree7faecc74eaef8da7c88f4082bf38a30f92ddd322
parenta7c4707ed223f2d0c5a31b2d119d1d92b3d00922 (diff)
downloadmv-c3f8a2808ea38f8ebd05408c19d2fafedcdd126b.tar.gz
mv-c3f8a2808ea38f8ebd05408c19d2fafedcdd126b.tar.bz2
mv-c3f8a2808ea38f8ebd05408c19d2fafedcdd126b.tar.xz
mv-c3f8a2808ea38f8ebd05408c19d2fafedcdd126b.zip
Dont show assert if servers list cant be loaded from disk.
-rw-r--r--src/gui/windows/serverdialog.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 46633fb33..ee5300d7d 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -546,10 +546,11 @@ void ServerDialog::loadServers(const bool addNew)
XML::Document doc(pathJoin(mDir,
branding.getStringValue("onlineServerFile")),
UseVirtFs_false,
- SkipError_false);
+ SkipError_true);
XmlNodeConstPtr rootNode = doc.rootNode();
- if ((rootNode == nullptr) || !xmlNameEqual(rootNode, "serverlist"))
+ if (rootNode == nullptr ||
+ !xmlNameEqual(rootNode, "serverlist"))
{
logger->log1("Error loading server list!");
return;