Commit b2ddac079abcd39ada9868af3d550992defbbf4c

Authored by 김태훈
1 parent 36aae9ce02
Exists in master and in 2 other branches fhd, fhd-demo

버그 수정

- 새로운 재료 넣기 후 자동 요리 창이 하나 더 뜨는 문제 수정
app/gui/oven_control/autocookconfigwindow.cpp
@@ -202,7 +202,7 @@ void AutoCookConfigWindow::start() @@ -202,7 +202,7 @@ void AutoCookConfigWindow::start()
202 w->showFullScreen(); 202 w->showFullScreen();
203 w->raise(); 203 w->raise();
204 204
205 - connect(w, SIGNAL(destroyed(QObject*)), SLOT(startTimer())); 205 + connect(w, SIGNAL(back()), SLOT(startTimer()));
206 } 206 }
207 207
208 void AutoCookConfigWindow::addFavorite() 208 void AutoCookConfigWindow::addFavorite()
app/gui/oven_control/autocookwindow.cpp
@@ -774,6 +774,7 @@ void AutoCookWindow::on_showNextStepButton_clicked() @@ -774,6 +774,7 @@ void AutoCookWindow::on_showNextStepButton_clicked()
774 void AutoCookWindow::on_backButton_clicked() 774 void AutoCookWindow::on_backButton_clicked()
775 { 775 {
776 Oven::getInstance()->stop(); 776 Oven::getInstance()->stop();
  777 + emit back();
777 close(); 778 close();
778 } 779 }
779 780
app/gui/oven_control/autocookwindow.h
@@ -85,6 +85,9 @@ private slots: @@ -85,6 +85,9 @@ private slots:
85 void on_configButton_clicked(); 85 void on_configButton_clicked();
86 void on_washButton_clicked(); 86 void on_washButton_clicked();
87 void on_helpButton_clicked(); 87 void on_helpButton_clicked();
  88 +
  89 +signals:
  90 + void back();
88 }; 91 };
89 92
90 #endif // AUTOCOOKWINDOW_H 93 #endif // AUTOCOOKWINDOW_H