mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-15 09:23:43 +02:00
- neutrino.cpp: stop lcd4l thread for flashing and remove dead code
In src/system/flashtool.cpp there was still old, unused code, which once stopped LCD4L during flash. However, it has not been jumped and executed for a long time. I have removed it now and introduced the corresponding code section in neutrino.cpp in stop_deamons() and reactivated so the stopping of the daemon. The sighandler() function calls up also stop_daemons(), so I removed the code there
This commit is contained in:
@@ -44,10 +44,6 @@
|
||||
#include <neutrino.h>
|
||||
#include <driver/display.h>
|
||||
|
||||
#ifdef ENABLE_LCD4LINUX
|
||||
#include "driver/lcd4l.h"
|
||||
#endif
|
||||
|
||||
CFlashTool::CFlashTool()
|
||||
{
|
||||
statusViewer = NULL;
|
||||
@@ -340,17 +336,6 @@ bool CFlashTool::getInfo()
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
void CFlashTool::stopDaemons()
|
||||
{
|
||||
#ifdef ENABLE_LCD4LINUX
|
||||
if (g_settings.lcd4l_support)
|
||||
CLCD4l::getInstance()->StopLCD4l();
|
||||
#endif
|
||||
|
||||
CNeutrinoApp::getInstance()->stopDaemonsForFlash();
|
||||
}
|
||||
|
||||
bool CFlashTool::erase(int globalProgressEnd)
|
||||
{
|
||||
erase_info_t lerase;
|
||||
|
@@ -53,7 +53,6 @@ class CFlashTool
|
||||
|
||||
bool getInfo();
|
||||
bool erase(int globalProgressEnd=-1);
|
||||
void stopDaemons();
|
||||
|
||||
public:
|
||||
CFlashTool();
|
||||
|
Reference in New Issue
Block a user