prev commit linux part

This commit is contained in:
David Kocik 2019-11-27 14:30:10 +01:00
parent 1ec7fc23e2
commit 9c79c7f644
4 changed files with 3 additions and 57 deletions

View file

@ -4693,19 +4693,11 @@ void Plater::export_gcode()
}
default_output_file = fs::path(Slic3r::fold_utf8_to_ascii(default_output_file.string()));
auto start_dir = wxGetApp().app_config->get_last_output_dir(default_output_file.parent_path().string());
<<<<<<< HEAD
if (GUI::RemovableDriveManager::get_instance().update())
{
if (!RemovableDriveManager::get_instance().is_path_on_removable_drive(start_dir))
{
start_dir = RemovableDriveManager::get_instance().get_drive_path();
=======
if (GUI::RemovableDriveManager::getInstance().update())
{
if (!RemovableDriveManager::getInstance().is_path_on_removable_drive(start_dir))
{
start_dir = RemovableDriveManager::getInstance().get_last_drive_path();
>>>>>>> check if last path is on rem drive
}
}
wxFileDialog dlg(this, (printer_technology() == ptFFF) ? _(L("Save G-code file as:")) : _(L("Save SL1 file as:")),