From 93d47dd1219ab81c4b65db5d4fe50d353ab5ac66 Mon Sep 17 00:00:00 2001
From: David Kocik <kocikdav@gmail.com>
Date: Mon, 26 Feb 2024 16:27:12 +0100
Subject: [PATCH] Fix of showing Physical printer webview tab at startup

---
 src/slic3r/GUI/GUI_App.cpp | 16 ++++++++++------
 src/slic3r/GUI/GUI_App.hpp |  2 +-
 src/slic3r/GUI/Sidebar.cpp |  6 +-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 8d11720edd..d8d5301c42 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -1410,6 +1410,8 @@ bool GUI_App::on_init_inner()
 
     update_mode(); // update view mode after fix of the object_list size
 
+    show_printer_webview_tab();
+
 #ifdef __APPLE__
     other_instance_message_handler()->bring_instance_forward();
 #endif //__APPLE__
@@ -3707,25 +3709,27 @@ void GUI_App::handle_connect_request_printer_pick(std::string msg)
     this->plater()->get_notification_manager()->push_notification(NotificationType::UserAccountID, NotificationManager::NotificationLevel::ImportantNotificationLevel, out);    
 }
 
-void GUI_App::show_printer_webview_tab(bool show, const DynamicPrintConfig& dpc/* = {}*/)
+void GUI_App::show_printer_webview_tab()
 {
-    if (!show) {
+    //bool show, const DynamicPrintConfig& dpc
+
+    if (DynamicPrintConfig* dpc = preset_bundle->physical_printers.get_selected_printer_config(); dpc == nullptr) {
         this->mainframe->select_tab(size_t(0));
         mainframe->remove_printer_webview_tab();
     } else {
-        std::string url = dpc.opt_string("print_host");
+        std::string url = dpc->opt_string("print_host");
         
         if (url.find("http://") != 0 && url.find("https://") != 0) {
             url = "http://" + url;
         }
 
         // set password / api key
-        if (dynamic_cast<const ConfigOptionEnum<AuthorizationType>*>(dpc.option("printhost_authorization_type"))->value == AuthorizationType::atKeyPassword) {
-            mainframe->set_printer_webview_api_key(dpc.opt_string("printhost_apikey"));
+        if (dynamic_cast<const ConfigOptionEnum<AuthorizationType>*>(dpc->option("printhost_authorization_type"))->value == AuthorizationType::atKeyPassword) {
+            mainframe->set_printer_webview_api_key(dpc->opt_string("printhost_apikey"));
         }
 #if 0 // The user password authentication is not working in prusa link as of now.
         else {
-            mainframe->set_printer_webview_credentials(dpc.opt_string("printhost_user"), dpc.opt_string("printhost_password"));
+            mainframe->set_printer_webview_credentials(dpc->opt_string("printhost_user"), dpc->opt_string("printhost_password"));
         }
 #endif // 0       
         // add printer or change url
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
index c26e043dae..bdaca92263 100644
--- a/src/slic3r/GUI/GUI_App.hpp
+++ b/src/slic3r/GUI/GUI_App.hpp
@@ -412,7 +412,7 @@ public:
     void            request_user_logout() {}
     int             request_user_unbind(std::string dev_id) { return 0; }
     void            handle_connect_request_printer_pick(std::string cmd);
-    void            show_printer_webview_tab(bool show, const DynamicPrintConfig& dpc = {});
+    void            show_printer_webview_tab();
     // return true if preset vas invisible and we have to installed it to make it selectable
     bool            select_printer_from_connect(const Preset* printer_preset);
     void            handle_script_message(std::string msg) {}
diff --git a/src/slic3r/GUI/Sidebar.cpp b/src/slic3r/GUI/Sidebar.cpp
index c551238a32..740a1f354a 100644
--- a/src/slic3r/GUI/Sidebar.cpp
+++ b/src/slic3r/GUI/Sidebar.cpp
@@ -718,11 +718,7 @@ void Sidebar::on_select_preset(wxCommandEvent& evt)
          */
         m_object_list->update_object_list_by_printer_technology();
 
-        if (combo->is_selected_physical_printer()) {
-            wxGetApp().show_printer_webview_tab(true, wxGetApp().preset_bundle->physical_printers.get_selected_printer().config);
-        } else {
-            wxGetApp().show_printer_webview_tab(false);
-        }
+        wxGetApp().show_printer_webview_tab();
     }
 
 #ifdef __WXMSW__