From 2acbfcaed2a28eccce67b52ae479d7c2b4e0f55d Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Fri, 12 Jul 2024 18:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8requestTemp?=
 =?UTF-8?q?late=E6=97=B6=E6=9C=AA=E4=BF=9D=E6=8A=A4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/PhoneDevice.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index 2ee786ae..8febf6e3 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -786,12 +786,12 @@ bool CPhoneDevice::Reboot(int resetType)
               GpioControl::reboot();
           });
         t.detach();
-
-        return true;
     }
-
-    long timeout = 1000;
-    RestartApp(resetType, timeout);
+    else
+    {
+        long timeout = 1000;
+        RestartApp(resetType, timeout);
+    }
 
     return true;
 }
@@ -1178,6 +1178,10 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
     params.zoom = mPhotoInfo.zoom;
     params.zoomRatio = mPhotoInfo.zoomRatio;
     params.requestTemplate = mPhotoInfo.requestTemplate;
+    if (params.requestTemplate <= 0 || params.requestTemplate > 5)
+    {
+        params.requestTemplate = 2;
+    }
 
     if (photoInfo.ldrEnabled)
     {