Merge branch 'master' of https://github.com/leyyin/stk-code into leyyin-master
This commit is contained in:
commit
b8ba6f9eb7
@ -1462,7 +1462,6 @@ static void cleanSuperTuxKart()
|
||||
|
||||
if(Online::RequestManager::isRunning())
|
||||
Online::RequestManager::get()->stopNetworkThread();
|
||||
|
||||
SFXManager::get()->stopThread();
|
||||
irr_driver->updateConfigIfRelevant();
|
||||
AchievementsManager::destroy();
|
||||
|
@ -361,11 +361,9 @@ namespace Online
|
||||
{
|
||||
HTTPRequest *request = (HTTPRequest *)clientp;
|
||||
|
||||
RequestManager* request_manager = RequestManager::get();
|
||||
|
||||
// Check if we are asked to abort the download. If so, signal this
|
||||
// back to libcurl by returning a non-zero status.
|
||||
if ((request_manager->getAbort() || request->isCancelled()) &&
|
||||
if ((RequestManager::get()->getAbort() || request->isCancelled()) &&
|
||||
request->isAbortable() )
|
||||
{
|
||||
// Indicates to abort the current download, which means that this
|
||||
|
@ -61,13 +61,13 @@ namespace Online
|
||||
{
|
||||
assert(isBusy());
|
||||
// Abort as early as possible if abort is requested
|
||||
if(RequestManager::get()->getAbort()) return;
|
||||
if (RequestManager::get()->getAbort() && isAbortable()) return;
|
||||
prepareOperation();
|
||||
if(RequestManager::get()->getAbort()) return;
|
||||
if (RequestManager::get()->getAbort() && isAbortable()) return;
|
||||
operation();
|
||||
if(RequestManager::get()->getAbort()) return;
|
||||
if (RequestManager::get()->getAbort() && isAbortable()) return;
|
||||
setExecuted();
|
||||
if(RequestManager::get()->getAbort()) return;
|
||||
if (RequestManager::get()->getAbort() && isAbortable()) return;
|
||||
afterOperation();
|
||||
} // execute
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user