Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix startup-failure case

Browse source
This commit is contained in:
howard-stearns 2017-01-26 14:05:16 -08:00
parent f36b968860
commit f9f0a4ea2d
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assignment-client/src/entities/EntityServer.cpp
View file

@ -367,9 +367,9 @@ void EntityServer::scriptRequestFinished() {
if (_scriptRequestLoop.isRunning()) { if (_scriptRequestLoop.isRunning()) {
_scriptRequestLoop.quit(); _scriptRequestLoop.quit();
} }
return;
} }
} }
return;
} else if (scriptRequest) { } else if (scriptRequest) {
qCritical() << "Failed to download script at" << urlString; qCritical() << "Failed to download script at" << urlString;
// See HTTPResourceRequest::onRequestFinished for interpretation of codes. For example, a 404 is code 6 and 403 is 3. A timeout is 2. Go figure. // See HTTPResourceRequest::onRequestFinished for interpretation of codes. For example, a 404 is code 6 and 403 is 3. A timeout is 2. Go figure.
@ -380,6 +380,9 @@ void EntityServer::scriptRequestFinished() {
// Hard stop of the assignment client on failure. We don't want anyone to think they have a filter in place when they don't. // Hard stop of the assignment client on failure. We don't want anyone to think they have a filter in place when they don't.
// Alas, only indications will be the above logging with assignment client restarting repeatedly, and clients will not see any entities. // Alas, only indications will be the above logging with assignment client restarting repeatedly, and clients will not see any entities.
stop(); stop();
if (_scriptRequestLoop.isRunning()) {
_scriptRequestLoop.quit();
}
} }
void EntityServer::nodeAdded(SharedNodePointer node) { void EntityServer::nodeAdded(SharedNodePointer node) {