sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing issue #138: No longer throw an exception if the server list is invalid, because the server list is always invalid in network games.

Browse Source
This commit is contained in:
lotodore
2012-06-17 13:35:31 +02:00
parent f989f447f3
commit 7bc8c1b9f2
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientthread.cpp
+5 -4
View File
@@ -936,15 +936,16 @@ ClientThread::GetContext()
string
ClientThread::GetCacheServerListFileName()
{
string fileName;
path tmpServerListPath(GetContext().GetCacheDir());
string serverListUrl(GetContext().GetServerListUrl());
// Retrieve the file name from the URL.
size_t pos = serverListUrl.find_last_of('/');
if (GetContext().GetCacheDir().empty() || serverListUrl.empty() || pos == string::npos || ++pos >= serverListUrl.length()) {
throw ClientException(__FILE__, __LINE__, ERR_SOCK_INVALID_SERVERLIST_URL, 0);
if (!GetContext().GetCacheDir().empty() && !serverListUrl.empty() && pos != string::npos && ++pos < serverListUrl.length()) {
tmpServerListPath /= serverListUrl.substr(pos);
fileName = tmpServerListPath.directory_string();
}
tmpServerListPath /= serverListUrl.substr(pos);
return tmpServerListPath.directory_string();
return fileName;
}
void