diff --git a/data/gui/addons_view_dialog.stkgui b/data/gui/addons_view_dialog.stkgui index deb1cc57e..9e89fd392 100644 --- a/data/gui/addons_view_dialog.stkgui +++ b/data/gui/addons_view_dialog.stkgui @@ -1,6 +1,6 @@ <stkgui> -<div x="0%" y="10%" width="90%" height="80%" layout="horizontal-row" > +<div x="5%" y="0%" width="90%" height="80%" layout="horizontal-row" > <div width="50%" height="90%" layout="vertical-row" > <icon id="icon" align="center" proportion="8" width="100%" icon="gui/logo.png"/> </div> @@ -13,7 +13,7 @@ </div> -<div x="90%" y = "10%" width="80%" height="10%" layout="horizontal-row" > +<div x="5%" y="80%" width="90%" height="10%" layout="horizontal-row" > <button id="cancel" I18N="Addons" text="Back" align="center"/> <button id="install" I18N="Addons" text="Install" align="center"/> </div> diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp index 5ed238e05..2d85f1270 100644 --- a/src/states_screens/main_menu_screen.cpp +++ b/src/states_screens/main_menu_screen.cpp @@ -243,7 +243,7 @@ void * MainMenuScreen::downloadNews( void * pthis) #endif // ------------------------------------------------------------------------------------------------------ #ifdef ADDONS_MANAGER -void MainMenuScreen::tearDown() +MainMenuScreen::~MainMenuScreen() { fprintf(stdout, "canceling the thread"); pthread_cancel(m_thread_news_text); diff --git a/src/states_screens/main_menu_screen.hpp b/src/states_screens/main_menu_screen.hpp index 444eead33..638e15d0b 100644 --- a/src/states_screens/main_menu_screen.hpp +++ b/src/states_screens/main_menu_screen.hpp @@ -36,6 +36,7 @@ public: void changeNewsText(std::string action); pthread_mutex_t m_mutex_news_text; pthread_t m_thread_news_text; + ~MainMenuScreen(); std::string m_news_text; void onUpdate(float delta, irr::video::IVideoDriver* driver); #endif @@ -48,11 +49,6 @@ public: /** \brief implement callback from parent class GUIEngine::Screen */ virtual void init(); -#ifdef ADDONS_MANAGER - /** \brief implement callback from parent class GUIEngine::Screen */ - virtual void tearDown(); -#endif - /** This function is used to download a text from the server to show the news. */ static void * downloadNews(void *);