diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index c9ed88f84..f601cd4bc 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -274,7 +274,7 @@ bool GUI_App::on_init_inner()
 
         this->obj_manipul()->update_if_dirty();
 
-#if __linux__
+#if !__APPLE__
 		RemovableDriveManager::get_instance().update(wxGetLocalTime(), true);
 #endif
 
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index d57864911..eb5f6d485 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -4158,7 +4158,7 @@ void Plater::priv::show_action_buttons(const bool is_ready_to_slice) const
         if (sidebar->show_reslice(false) |
             sidebar->show_export(true) |
             sidebar->show_send(send_gcode_shown) |
-            sidebar->show_disconnect(disconnect_shown))
+            sidebar->show_disconnect(false/*disconnect_shown*/))
             sidebar->Layout();
     }
     else
@@ -4709,12 +4709,13 @@ void Plater::export_gcode()
         fs::path path = into_path(dlg.GetPath());
         wxGetApp().app_config->update_last_output_dir(path.parent_path().string());
         output_path = std::move(path);
-		RemovableDriveManager::get_instance().update(0, true);
-		RemovableDriveManager::get_instance().set_last_save_path(output_path.string()); 
-		
     }
     if (! output_path.empty())
+	{
+		RemovableDriveManager::get_instance().update(0, true);
+		RemovableDriveManager::get_instance().set_last_save_path(output_path.string());
         p->export_gcode(std::move(output_path), PrintHostJob());
+	}
 	
 }
 
diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp
index d5f224409..7ab34204b 100644
--- a/src/slic3r/GUI/RemovableDriveManager.cpp
+++ b/src/slic3r/GUI/RemovableDriveManager.cpp
@@ -410,7 +410,7 @@ void RemovableDriveManager::init()
 {
 	//add_callback([](void) { RemovableDriveManager::get_instance().print(); });
 #if _WIN32
-	register_window();
+	//register_window();
 #elif __APPLE__
     m_rdmmm->register_window();
 #endif
@@ -501,16 +501,16 @@ void RemovableDriveManager::set_last_save_path(const std::string& path)
 }
 bool RemovableDriveManager::is_last_drive_removed()
 {
-	std::cout<<"is last: "<<m_last_save_path;
+	//std::cout<<"is last: "<<m_last_save_path;
 	m_drives_count = m_current_drives.size();
 	if(m_last_save_path == "")
 	{
-		std::cout<<"\n";
+		//std::cout<<"\n";
 		return true;
 	}
 	bool r = !is_drive_mounted(m_last_save_path);
 	if (r) reset_last_save_path();
-	std::cout<<" "<< r <<"\n";
+	//std::cout<<" "<< r <<"\n";
 	return r;
 }
 bool RemovableDriveManager::is_last_drive_removed_with_update(const long time)