Fix colorlcd auto power off on cleared shutdown warning trigger (#1164)

This commit is contained in:
Malte Langermann
2021-11-28 12:39:40 +11:00
committed by GitHub
parent 229c59dae3
commit 9a5663e611
3 changed files with 36 additions and 5 deletions
+13 -1
View File
@@ -201,12 +201,24 @@ void raiseAlert(const char * title, const char * msg, const char * action, uint8
}
// POPUP_CONFIRMATION
bool confirmationDialog(const char* title, const char* msg, bool checkPwr)
bool confirmationDialog(const char* title, const char* msg, bool checkPwr, const std::function<bool(void)>& closeCondition)
{
bool confirmed = false;
auto dialog = new FullScreenDialog(WARNING_TYPE_CONFIRM, title ? title : "",
msg ? msg : "", "",
[&confirmed]() { confirmed = true; });
if(closeCondition)
{
dialog->setCloseCondition([&confirmed,&closeCondition]() {
if(closeCondition())
{
confirmed=true;
return true;
} else {
return false;
}});
}
if (checkPwr) {
dialog->runForever();
} else {