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

More minor changes to make sure crashes don't occur due to the thread in the main screen

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6156 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-09-27 15:46:24 +00:00
parent 4976d9d60c
commit dd50501e73
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/states_screens/main_menu_screen.cpp
View File

@ -95,6 +95,7 @@ void MainMenuScreen::changeNewsText(std::string action)
} }
if(action == "offline") if(action == "offline")
{ {
pthread_testcancel(); // check if thread was cancelled
pthread_mutex_lock(&(this->m_mutex_news_text)); pthread_mutex_lock(&(this->m_mutex_news_text));
m_news_text = "offline"; m_news_text = "offline";
pthread_mutex_unlock(&(this->m_mutex_news_text)); pthread_mutex_unlock(&(this->m_mutex_news_text));
@ -267,6 +268,12 @@ void * MainMenuScreen::downloadNews( void * pthis)
void MainMenuScreen::tearDown() void MainMenuScreen::tearDown()
{ {
fprintf(stdout, "canceling the thread\n"); fprintf(stdout, "canceling the thread\n");
// grab the mutex before returning to make sure the screen is not deleted while the thread is
// changing the text, which would result in weird results (tearDown does not automatically mean
// the screen is going to be destroyed but let's play on the safe side)
pthread_mutex_lock(&(this->m_mutex_news_text));
pthread_cancel(m_thread_news_text); pthread_cancel(m_thread_news_text);
pthread_mutex_unlock(&(this->m_mutex_news_text));
} }
#endif #endif