ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small clean up improvement

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13668 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
unitraxx 2013-09-12 02:44:52 +00:00
parent 5ba1493990
commit e71d99aa2d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.cpp
View File

@ -1244,6 +1244,7 @@ void cleanSuperTuxKart()
INetworkHttp::get()->stopNetworkThread(); INetworkHttp::get()->stopNetworkThread();
if(Online::HTTPManager::isRunning()) if(Online::HTTPManager::isRunning())
Online::HTTPManager::get()->stopNetworkThread(); Online::HTTPManager::get()->stopNetworkThread();
//delete in reverse order of what they were created in. //delete in reverse order of what they were created in.
//see InitTuxkart() //see InitTuxkart()
Online::ServersManager::deallocate(); Online::ServersManager::deallocate();
@ -1252,7 +1253,6 @@ void cleanSuperTuxKart()
Online::CurrentUser::deallocate(); Online::CurrentUser::deallocate();
GUIEngine::DialogQueue::deallocate(); GUIEngine::DialogQueue::deallocate();
Referee::cleanup(); Referee::cleanup();
if(ReplayPlay::get()) ReplayPlay::destroy(); if(ReplayPlay::get()) ReplayPlay::destroy();
if(race_manager) delete race_manager; if(race_manager) delete race_manager;

2
src/online/http_manager.cpp
View File

@ -221,7 +221,7 @@ namespace Online{
delete request; delete request;
} }
me->m_request_queue.unlock(); me->m_request_queue.unlock();
HTTPManager::deallocate();
pthread_exit(NULL); pthread_exit(NULL);
return 0; return 0;
} // mainLoop } // mainLoop

2
src/online/http_manager.hpp
View File

@ -77,6 +77,7 @@ namespace Online{
static void *mainLoop(void *obj); static void *mainLoop(void *obj);
void startNetworkThread(); void startNetworkThread();
static void deallocate();
HTTPManager(); //const std::string &url HTTPManager(); //const std::string &url
~HTTPManager(); ~HTTPManager();
@ -86,7 +87,6 @@ namespace Online{
// singleton // singleton
static HTTPManager* get(); static HTTPManager* get();
static void deallocate();
static bool isRunning(); static bool isRunning();
//Execute //Execute