mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-13 08:23:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: change lcd4l stop handling

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6152321742
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-08-22 (Mon, 22 Aug 2022)

Origin message was:
------------------
- neutrino: change lcd4l stop handling

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2022-08-22 21:08:06 +02:00
parent 29818d3f7d
commit a644ee80e5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/neutrino.cpp
View File

@@ -4705,7 +4705,8 @@ void CNeutrinoApp::ExitRun(int exit_code)
printf("[neutrino] hw_caps->can_shutdown: %d\n", g_info.hw_caps->can_shutdown); printf("[neutrino] hw_caps->can_shutdown: %d\n", g_info.hw_caps->can_shutdown);
#ifdef ENABLE_LCD4LINUX #ifdef ENABLE_LCD4LINUX
CLCD4l::getInstance()->StopLCD4l(); if (g_settings.lcd4l_support)
CLCD4l::getInstance()->StopLCD4l();
#endif #endif
//NI InfoIcons //NI InfoIcons
@@ -5504,7 +5505,8 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
hint->paint(); hint->paint();
#ifdef ENABLE_LCD4LINUX #ifdef ENABLE_LCD4LINUX
CLCD4l::getInstance()->StopLCD4l(); if (g_settings.lcd4l_support)
CLCD4l::getInstance()->StopLCD4l();
#endif #endif
saveSetup(NEUTRINO_SETTINGS_FILE); saveSetup(NEUTRINO_SETTINGS_FILE);
@@ -5624,6 +5626,11 @@ void stop_daemons(bool stopall, bool for_flash)
tuxtxt_stop(); tuxtxt_stop();
tuxtxt_close(); tuxtxt_close();
#ifdef ENABLE_LCD4LINUX
if (g_settings.lcd4l_support)
CLCD4l::getInstance()->StopLCD4l();
delete CLCD4l::getInstance();
#endif
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
cGLCD::Exit(); cGLCD::Exit();
#endif #endif
@@ -5710,10 +5717,6 @@ void sighandler (int signum)
case SIGTERM: case SIGTERM:
case SIGINT: case SIGINT:
CVFD::getInstance()->ShowText("Exiting ..."); CVFD::getInstance()->ShowText("Exiting ...");
#ifdef ENABLE_LCD4LINUX
CLCD4l::getInstance()->StopLCD4l();
delete CLCD4l::getInstance();
#endif
delete cHddStat::getInstance(); delete cHddStat::getInstance();
delete CRecordManager::getInstance(); delete CRecordManager::getInstance();
//CNeutrinoApp::getInstance()->saveSetup(NEUTRINO_SETTINGS_FILE); //CNeutrinoApp::getInstance()->saveSetup(NEUTRINO_SETTINGS_FILE);