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

Fix a segfault problem with addons (the buttons are now loaded from a file, and the code still used some button pointer to desactivated them, but they was NULL)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5869 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
xapantu 2010-09-02 15:24:56 +00:00
parent 8af8d1ab69
commit 53037c25e1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/gui/addons_view_dialog.stkgui
View File

@ -3,7 +3,7 @@
<div x="2%" y="10%" width="96%" height="80%" layout="horizontal-row" > <div x="2%" y="10%" width="96%" height="80%" layout="horizontal-row" >
<div width="50%" height="100%" layout="vertical-row" > <div width="50%" height="100%" layout="vertical-row" >
<icon id="icon" align="center" proportion="8" width="100%" icon="gui/logo.png"/> <icon id="icon" align="center" proportion="8" width="100%" icon="gui/logo.png"/>
<button id="cancel" I18N="Addons" text="Back" align="center"/> <button id="back" I18N="Addons" text="Back" align="center"/>
</div> </div>
<div width="50%" height="100%" layout="vertical-row" > <div width="50%" height="100%" layout="vertical-row" >
<label id="name" width="100%" text="Name:" proportion="1" /> <label id="name" width="100%" text="Name:" proportion="1" />

7
src/states_screens/dialogs/addons_loading.cpp
View File

@ -116,10 +116,13 @@ GUIEngine::EventPropagation AddonsLoading::processEvent(const std::string& event
m_widgets.push_back(m_state); m_widgets.push_back(m_state);
m_state->add(); m_state->add();
m_back_button->setDeactivated(); this->getWidget<ButtonWidget>("back")->setDeactivated();
//FIXME : re-implement this buttons
/*
m_next->setDeactivated(); m_next->setDeactivated();
m_previous->setDeactivated(); m_previous->setDeactivated();
this->install_button->setDeactivated(); */
this->getWidget<ButtonWidget>("install")->setDeactivated();
m_percent_update = true; m_percent_update = true;
pthread_t thread; pthread_t thread;
pthread_create(&thread, NULL, &AddonsLoading::startInstall, this); pthread_create(&thread, NULL, &AddonsLoading::startInstall, this);