From 8765fbc7758887cf39a3aee13e30a86b58a31d36 Mon Sep 17 00:00:00 2001
From: victor <taehoon@falinux.com>
Date: Wed, 7 Jun 2017 12:49:25 +0900
Subject: [PATCH] =?UTF-8?q?=EC=88=98=EB=8F=99=20=EC=9A=94=EB=A6=AC?=
 =?UTF-8?q?=EC=9D=98=20=EC=98=88=EC=97=B4=20=EB=AA=A8=EB=93=9C=20=EB=8F=99?=
 =?UTF-8?q?=EC=9E=91=20=EA=B0=9C=EC=84=A0=20-=20=EB=AC=B8=EC=9D=B4=20?=
 =?UTF-8?q?=EC=97=B4=EB=A6=B0=20=EC=83=81=ED=83=9C=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=EB=8F=84=20=EB=AC=B8=EC=A0=9C=20=EC=97=86=EC=9D=B4=20=EB=8F=99?=
 =?UTF-8?q?=EC=9E=91=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20-?=
 =?UTF-8?q?=20=EC=8B=9C=EA=B0=84=20=ED=91=9C=EC=8B=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/oven.cpp         | 8 ++++----
 app/gui/oven_control/preheatpopup.cpp | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/gui/oven_control/oven.cpp b/app/gui/oven_control/oven.cpp
index ac48f1d..2693355 100644
--- a/app/gui/oven_control/oven.cpp
+++ b/app/gui/oven_control/oven.cpp
@@ -395,8 +395,8 @@ void Oven::stopCooking()
 
 void Oven::startPreheating()
 {
-    if (preheatingStartable())
-    {
+//    if (preheatingStartable())
+//    {
         if (cooking())
             stopCooking();
 
@@ -404,7 +404,7 @@ void Oven::startPreheating()
         interface->startPreheating();
 
         emit changed(this);
-    }
+//    }
 }
 
 void Oven::stopPreheating()
@@ -882,7 +882,7 @@ void Oven::onDoorClosed()
 
     emit changed(this);
 
-    if (!cooldown() && paused())
+    if (!cooldown() && !preheating() && paused())
         startCooking();
 
     if (damper())
diff --git a/app/gui/oven_control/preheatpopup.cpp b/app/gui/oven_control/preheatpopup.cpp
index 6660c41..8865cfc 100644
--- a/app/gui/oven_control/preheatpopup.cpp
+++ b/app/gui/oven_control/preheatpopup.cpp
@@ -28,6 +28,8 @@ PreheatPopup::PreheatPopup(QWidget *parent, Oven *oven) :
     ui->preheatGauge->setMinimum(oven->currentTemp());
     ui->preheatGauge->setValue(oven->currentTemp());
 
+    updateView();
+
     start();
 }
 
@@ -38,7 +40,7 @@ PreheatPopup::~PreheatPopup()
 
 void PreheatPopup::updateView()
 {
-    ui->timeLabel->setText(Stringer::remainingTime(oven->time(), Stringer::fontSize14));
+    ui->timeLabel->setText(Stringer::remainingTime(oven->msecs(), Stringer::fontSize14));
 
     int curInterTemp = oven->currentInterTemp();
     if (oven->interTempEnabled())
-- 
2.1.4