merge

4 files changed, 3 insertions, 5 deletions

diff --git a/src/slic3r/GUI/AppConfig.cpp b/src/slic3r/GUI/AppConfig.cpp
index d33d945ef..705582251 100644
--- a/src/slic3r/GUI/AppConfig.cpp
+++ b/src/slic3r/GUI/AppConfig.cpp
@@ -357,6 +357,7 @@ void AppConfig::update_skein_dir(const std::string &dir)
 
 std::string AppConfig::get_last_output_dir(const std::string &alt) const
 {
+	
     const auto it = m_storage.find("");
     if (it != m_storage.end()) {
         const auto it2 = it->second.find("last_output_path");
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index cff3164e8..72d01b41d 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -3586,8 +3586,6 @@ void Plater::priv::on_process_completed(wxCommandEvent &evt)
 	//added to show disconnect_button after writing
 	show_action_buttons(false);
 
-	show_action_buttons(false);
-
     if (canceled) {
         if (wxGetApp().get_mode() == comSimple)
             sidebar->set_btn_label(ActionButtonType::abReslice, "Slice now");
diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp
index 77a387aaf..1c2a29b0b 100644
--- a/src/slic3r/GUI/RemovableDriveManager.cpp
+++ b/src/slic3r/GUI/RemovableDriveManager.cpp
@@ -329,7 +329,6 @@ bool RemovableDriveManager::compare_filesystem_id(const std::string &path_a, con
 	dev_t id_b = buf.st_dev;
 	return id_a == id_b;
 }
-
 void RemovableDriveManager::eject_drive(const std::string &path)
 {
 	if (m_current_drives.empty())
@@ -518,4 +517,3 @@ void RemovableDriveManager::reset_last_save_path()
 	m_last_save_path = "";
 }
 }}//namespace Slicer::Gui
-
diff --git a/src/slic3r/GUI/RemovableDriveManager.hpp b/src/slic3r/GUI/RemovableDriveManager.hpp
index fa42f5e73..25f6286d1 100644
--- a/src/slic3r/GUI/RemovableDriveManager.hpp
+++ b/src/slic3r/GUI/RemovableDriveManager.hpp
@@ -93,4 +93,5 @@ protected:
 };
 #endif
 }}
-#endif
\ No newline at end of file
+#endif
+