From b2ddac079abcd39ada9868af3d550992defbbf4c Mon Sep 17 00:00:00 2001 From: victor Date: Fri, 2 Jun 2017 17:11:56 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20-=20?= =?UTF-8?q?=EC=83=88=EB=A1=9C=EC=9A=B4=20=EC=9E=AC=EB=A3=8C=20=EB=84=A3?= =?UTF-8?q?=EA=B8=B0=20=ED=9B=84=20=EC=9E=90=EB=8F=99=20=EC=9A=94=EB=A6=AC?= =?UTF-8?q?=20=EC=B0=BD=EC=9D=B4=20=ED=95=98=EB=82=98=20=EB=8D=94=20?= =?UTF-8?q?=EB=9C=A8=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/autocookconfigwindow.cpp | 2 +- app/gui/oven_control/autocookwindow.cpp | 1 + app/gui/oven_control/autocookwindow.h | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/gui/oven_control/autocookconfigwindow.cpp b/app/gui/oven_control/autocookconfigwindow.cpp index 2ab0fba..13e5f3a 100644 --- a/app/gui/oven_control/autocookconfigwindow.cpp +++ b/app/gui/oven_control/autocookconfigwindow.cpp @@ -202,7 +202,7 @@ void AutoCookConfigWindow::start() w->showFullScreen(); w->raise(); - connect(w, SIGNAL(destroyed(QObject*)), SLOT(startTimer())); + connect(w, SIGNAL(back()), SLOT(startTimer())); } void AutoCookConfigWindow::addFavorite() diff --git a/app/gui/oven_control/autocookwindow.cpp b/app/gui/oven_control/autocookwindow.cpp index b0bbfa5..8317691 100644 --- a/app/gui/oven_control/autocookwindow.cpp +++ b/app/gui/oven_control/autocookwindow.cpp @@ -774,6 +774,7 @@ void AutoCookWindow::on_showNextStepButton_clicked() void AutoCookWindow::on_backButton_clicked() { Oven::getInstance()->stop(); + emit back(); close(); } diff --git a/app/gui/oven_control/autocookwindow.h b/app/gui/oven_control/autocookwindow.h index 56d01ed..d599990 100644 --- a/app/gui/oven_control/autocookwindow.h +++ b/app/gui/oven_control/autocookwindow.h @@ -85,6 +85,9 @@ private slots: void on_configButton_clicked(); void on_washButton_clicked(); void on_helpButton_clicked(); + +signals: + void back(); }; #endif // AUTOCOOKWINDOW_H -- 2.1.4