mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 23:13:00 +02:00
lcd4l: fix removing start/stop hint when init script fails
Origin commit data
------------------
Branch: ni/coolstream
Commit: 921df0c713
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-07-16 (Fri, 16 Jul 2021)
Origin message was:
------------------
- lcd4l: fix removing start/stop hint when init script fails
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -169,6 +169,8 @@ void CLCD4l::StartLCD4l()
|
||||
{
|
||||
if (exec_initscript("lcd4linux", "start"))
|
||||
OnAfterStart();
|
||||
else
|
||||
OnAfterError();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -190,6 +192,8 @@ void CLCD4l::StopLCD4l()
|
||||
|
||||
if (exec_initscript("lcd4linux", "stop"))
|
||||
OnAfterStop();
|
||||
else
|
||||
OnAfterError();
|
||||
}
|
||||
|
||||
void CLCD4l::SwitchLCD4l()
|
||||
@@ -879,6 +883,8 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
|
||||
OnBeforeRestart();
|
||||
if (exec_initscript("lcd4linux", "restart"))
|
||||
OnAfterRestart();
|
||||
else
|
||||
OnAfterError();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -67,12 +67,13 @@ class CLCD4l
|
||||
|
||||
// use signal/slot handlers
|
||||
// That is helping to keep the GUI code away from code inside ./src/driver.
|
||||
sigc::signal<void> OnBeforeRestart,
|
||||
OnAfterRestart,
|
||||
OnBeforeStart,
|
||||
sigc::signal<void> OnBeforeStart,
|
||||
OnAfterStart,
|
||||
OnBeforeStop,
|
||||
OnAfterStop;
|
||||
OnAfterStop,
|
||||
OnBeforeRestart,
|
||||
OnAfterRestart,
|
||||
OnAfterError;
|
||||
|
||||
private:
|
||||
std::thread *thrLCD4l;
|
||||
|
@@ -340,4 +340,6 @@ void CLCD4lSetup::connectSlots()
|
||||
CLCD4l::getInstance()->OnAfterStart.connect(sl_remove);
|
||||
CLCD4l::getInstance()->OnAfterStop.connect(sl_remove);
|
||||
CLCD4l::getInstance()->OnAfterRestart.connect(sl_remove);
|
||||
|
||||
CLCD4l::getInstance()->OnAfterError.connect(sl_remove);
|
||||
}
|
||||
|
Reference in New Issue
Block a user