diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index 6b2e383..6659c01 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -27,7 +27,8 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : QMainWindow(parent), ui(new Ui::ManualCookWindow), - repeat(false) + repeat(false), + cookDone(false) { ui->setupUi(this); @@ -486,7 +487,7 @@ QPushButton:focus { background-image: url(%2); }"); ui->repeatButton->setChecked(repeat); - if (done) + if (cookDone) { if (oven->door()) ui->upperStack->setCurrentIndex(0); // Clock @@ -532,7 +533,7 @@ void ManualCookWindow::onOvenUpdated(Oven *oven) if (oven->interTempEnabled() && oven->currentInterTemp() >= oven->interTemp()) { - done = true; + cookDone = true; stop(); } @@ -549,17 +550,20 @@ void ManualCookWindow::onOvenUpdated(Oven *oven) updateView(); } - else if (lastCheckedCooking && !oven->cooking()){ + else if (lastCheckedCooking && !oven->cooking()) + { if ((oven->interTempEnabled() && oven->currentInterTemp() >= oven->interTemp()) || oven->time() == 0) { lastCheckedCooking = oven->cooking(); - done = true; + cookDone = true; + + emit done(); } } - if (done && oven->door()) - done = false; + if (cookDone && oven->door()) + cookDone = false; lastCheckedCooking = oven->cooking(); @@ -595,7 +599,7 @@ void ManualCookWindow::start() if (oven->time() > 0) { - done = false; + cookDone = false; SoundPlayer::playStart(); diff --git a/app/gui/oven_control/manualcookwindow.h b/app/gui/oven_control/manualcookwindow.h index fce1bd5..da33588 100644 --- a/app/gui/oven_control/manualcookwindow.h +++ b/app/gui/oven_control/manualcookwindow.h @@ -27,6 +27,7 @@ protected: signals: void cookStopRequested(); + void done(); public slots: @@ -134,7 +135,7 @@ private: QTimer monitor3; bool monitorTriggered; - bool done; + bool cookDone; ManualCookSetting repeatSetting; bool repeat;