From 8ce07d3e8e2c616acee96748510aac43be772af0 Mon Sep 17 00:00:00 2001
From: markleaf131313 <119396518+markleaf131313@users.noreply.github.com>
Date: Sun, 18 Feb 2024 09:54:43 -0500
Subject: [PATCH] Show dialog when opening 3mf files to choose whether to
 import settings. (#4110)

* Show dialog when opening 3mf files to choose whether to import settings.

* Merge branch 'main' into main
---
 src/slic3r/GUI/Plater.cpp | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index ec26716b2d..b3f445ea03 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -10136,23 +10136,21 @@ bool Plater::open_3mf_file(const fs::path &file_path)
     }
 
     LoadType load_type = LoadType::Unknown;
-    if (!model().objects.empty()) {
-        bool show_drop_project_dialog = true;
-        if (show_drop_project_dialog) {
-            ProjectDropDialog dlg(filename);
-            if (dlg.ShowModal() == wxID_OK) {
-                int choice = dlg.get_action();
-                load_type  = static_cast<LoadType>(choice);
-                wxGetApp().app_config->set("import_project_action", std::to_string(choice));
+    
+    bool show_drop_project_dialog = true;
+    if (show_drop_project_dialog) {
+        ProjectDropDialog dlg(filename);
+        if (dlg.ShowModal() == wxID_OK) {
+            int choice = dlg.get_action();
+            load_type  = static_cast<LoadType>(choice);
+            wxGetApp().app_config->set("import_project_action", std::to_string(choice));
 
-                // BBS: jump to plater panel
-                wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor);
-            }
-        } else
-            load_type = static_cast<LoadType>(
-                std::clamp(std::stoi(wxGetApp().app_config->get("import_project_action")), static_cast<int>(LoadType::OpenProject), static_cast<int>(LoadType::LoadConfig)));
+            // BBS: jump to plater panel
+            wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor);
+        }
     } else
-        load_type = LoadType::OpenProject;
+        load_type = static_cast<LoadType>(
+            std::clamp(std::stoi(wxGetApp().app_config->get("import_project_action")), static_cast<int>(LoadType::OpenProject), static_cast<int>(LoadType::LoadConfig)));
 
     if (load_type == LoadType::Unknown) return false;