diff --git a/src/gui/components/cc_timer.cpp b/src/gui/components/cc_timer.cpp index a54c9bfc1..f3ef5b751 100644 --- a/src/gui/components/cc_timer.cpp +++ b/src/gui/components/cc_timer.cpp @@ -87,9 +87,6 @@ void* CComponentsTimer::initThreadAction(void *arg) //start up running timer with own thread, return true on succses void CComponentsTimer::initThread() { - if (!tm_enable) - return; - if(!tm_thread) { void *ptr = static_cast(this); diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 6cf30cf8d..7012c844c 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1101,16 +1101,17 @@ void CMenuWidget::integratePlugins(int integration, const unsigned int shortcut, void CMenuWidget::hide() { - if(savescreen && background) + if(savescreen && background) { + ResetModules(); restoreScreen();//FIXME - else { + } else { if (header) header->kill(); if (info_box) info_box->kill(); if (details_line) details_line->hide(); - frameBuffer->paintBackgroundBoxRel(x, y, full_width, full_height + footer_height); + frameBuffer->paintBackgroundBoxRel(x, y, full_width, full_height/* + footer_height*/); // full_height includes footer_height : see calcSize //paintHint(-1); } paintHint(-1); @@ -1330,7 +1331,7 @@ void CMenuWidget::setMenuPos(const int& menu_width) int scr_y = frameBuffer->getScreenY(); int scr_w = frameBuffer->getScreenWidth(); int scr_h = frameBuffer->getScreenHeight(); - int real_h = full_height + footer_height + hint_height; + int real_h = full_height/* + footer_height*/ + hint_height; // full_height includes footer_height : see calcSize int x_old = x; int y_old = y; //configured positions @@ -1450,7 +1451,7 @@ void CMenuWidget::saveScreen() return; delete[] background; - saveScreen_height = full_height+footer_height; + saveScreen_height = full_height/* + footer_height*/; // full_height includes footer_height : see calcSize saveScreen_width = full_width; saveScreen_y = y; saveScreen_x = x; @@ -1483,7 +1484,7 @@ void CMenuWidget::enableSaveScreen(bool enable) void CMenuWidget::paintHint(int pos) { if (!g_settings.show_menu_hints){ - ResetModules(); //ensure clean up on changed setting + //ResetModules(); //ensure clean up on changed setting return; }