diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 0f2ae4e3c..fbe67e3bf 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -200,9 +200,6 @@ extern cAudio * audioDecoder; cPowerManager *powerManager; cCpuFreqManager * cpuFreq; -#ifdef ENABLE_LCD4LINUX -void stop_lcd4l_support(void); -#endif void stop_daemons(bool stopall = true, bool for_flash = false); void stop_video(void); @@ -4714,7 +4711,7 @@ void CNeutrinoApp::ExitRun(int exit_code) printf("[neutrino] hw_caps->can_shutdown: %d\n", g_info.hw_caps->can_shutdown); #ifdef ENABLE_LCD4LINUX - stop_lcd4l_support(); + CLCD4l::getInstance()->StopLCD4l(); #endif if (SDTreloadChannels) @@ -5462,7 +5459,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey) hint->paint(); #ifdef ENABLE_LCD4LINUX - stop_lcd4l_support(); + CLCD4l::getInstance()->StopLCD4l(); #endif saveSetup(NEUTRINO_SETTINGS_FILE); @@ -5552,14 +5549,6 @@ void CNeutrinoApp::stopDaemonsForFlash() /************************************************************************************** * Main programm - no function here * **************************************************************************************/ -#ifdef ENABLE_LCD4LINUX -void stop_lcd4l_support() -{ - if (g_settings.lcd4l_support) - CLCD4l::getInstance()->StopLCD4l(); -} -#endif - void stop_daemons(bool stopall, bool for_flash) { CMoviePlayerGui::getInstance().stopPlayBack(); @@ -5673,7 +5662,8 @@ void sighandler (int signum) case SIGINT: CVFD::getInstance()->ShowText("Exiting ..."); #ifdef ENABLE_LCD4LINUX - stop_lcd4l_support(); + CLCD4l::getInstance()->StopLCD4l(); + delete CLCD4l::getInstance(); #endif delete cHddStat::getInstance(); delete CRecordManager::getInstance();