From dc8bdb04bb4085f618e84efa83aff049cf14f6c2 Mon Sep 17 00:00:00 2001
From: "maosheng.wei" <maosheng.wei@bambulab.com>
Date: Fri, 30 Jun 2023 17:47:54 +0800
Subject: [PATCH] FIX: [STUDIO-3515] Resolution information disappears

Change-Id: I24de7c63746cd92980a11ce88d8393e6ffcb18b5
---
 src/slic3r/GUI/CameraPopup.cpp   | 11 ++++++++++-
 src/slic3r/GUI/DeviceManager.cpp |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/slic3r/GUI/CameraPopup.cpp b/src/slic3r/GUI/CameraPopup.cpp
index 77e051094..b21c37878 100644
--- a/src/slic3r/GUI/CameraPopup.cpp
+++ b/src/slic3r/GUI/CameraPopup.cpp
@@ -297,12 +297,21 @@ void CameraPopup::check_func_supported(MachineObject *obj2)
         auto curr_res = to_resolution_msg_string(CameraResolution(i));
         std::vector <std::string> ::iterator it = std::find(resolution_supported.begin(), resolution_supported.end(), curr_res);
         if ((it == resolution_supported.end())||(support_count <= 1) || !obj->is_support_1080dpi)
-            m_resolution_options[i] -> Hide();
+            m_resolution_options[i]->Hide();
+        else {
+            m_resolution_options[i]->Show();
+            if (m_obj->camera_resolution == curr_res) {
+                resolution_rbtns[i]->SetValue(true);
+            }
+        }
     }
     //hide resolution if there is only one choice
     if (support_count <= 1 || !obj->is_support_1080dpi) {
         m_text_resolution->Hide();
     }
+    else {
+        m_text_resolution->Show();
+    }
 }
 
 void CameraPopup::update(bool vcamera_streaming)
diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index c8338445a..5d3c754c6 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -2336,7 +2336,7 @@ void MachineObject::reset()
     camera_recording = false;
     camera_recording_when_printing = false;
     camera_timelapse = false;
-    camera_resolution = "";
+    //camera_resolution = "";
     printing_speed_mag = 100;
     gcode_file_prepare_percent = 0;
     iot_print_status = "";