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

Fix #1484 (crash on windows in release mode).

Browse Source
This commit is contained in:
hiker 2014-08-27 13:46:42 +10:00
parent 4cb8955f83
commit 46396f4a7e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/client_network_manager.cpp
View File

@ -117,7 +117,10 @@ ClientNetworkManager::ClientNetworkManager()
ClientNetworkManager::~ClientNetworkManager() ClientNetworkManager::~ClientNetworkManager()
{ {
pthread_cancel(*m_thread_keyboard); // On windows in release mode there is no console, and the
// thread is not created.
if(m_thread_keyboard)
pthread_cancel(*m_thread_keyboard);
} }
void ClientNetworkManager::run() void ClientNetworkManager::run()
@ -133,10 +136,17 @@ void ClientNetworkManager::run()
Log::info("ClientNetworkManager", "Host initialized."); Log::info("ClientNetworkManager", "Host initialized.");
// On windows in release mode the console is suppressed, so nothing can
// be read from std::cin. Since getline(std::cin,...) then returns
// an empty string, the waitInput thread is running all the time, consuming
// CPU. Therefore don't start the console thread in this case.
#if defined(WIN32) && defined(_MSC_VER) && !defined(DEBUG)
m_thread_keyboard = NULL;
#else
// listen keyboard console input // listen keyboard console input
m_thread_keyboard = (pthread_t*)(malloc(sizeof(pthread_t))); m_thread_keyboard = (pthread_t*)(malloc(sizeof(pthread_t)));
pthread_create(m_thread_keyboard, NULL, waitInput, NULL); pthread_create(m_thread_keyboard, NULL, waitInput, NULL);
#endif
NetworkManager::run(); NetworkManager::run();
Log::info("ClientNetworkManager", "Ready !"); Log::info("ClientNetworkManager", "Ready !");