3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

merge

Browse source
This commit is contained in:
David Kocik 2019-12-13 15:26:42 +01:00
commit 81a2f8535a
4 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/slic3r/GUI/AppConfig.cpp
View file

@ -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 std::string AppConfig::get_last_output_dir(const std::string &alt) const
{ {
const auto it = m_storage.find(""); const auto it = m_storage.find("");
if (it != m_storage.end()) { if (it != m_storage.end()) {
const auto it2 = it->second.find("last_output_path"); const auto it2 = it->second.find("last_output_path");

2
src/slic3r/GUI/Plater.cpp
View file

@ -3586,8 +3586,6 @@ void Plater::priv::on_process_completed(wxCommandEvent &evt)
//added to show disconnect_button after writing //added to show disconnect_button after writing
show_action_buttons(false); show_action_buttons(false);
show_action_buttons(false);
if (canceled) { if (canceled) {
if (wxGetApp().get_mode() == comSimple) if (wxGetApp().get_mode() == comSimple)
sidebar->set_btn_label(ActionButtonType::abReslice, "Slice now"); sidebar->set_btn_label(ActionButtonType::abReslice, "Slice now");

2
src/slic3r/GUI/RemovableDriveManager.cpp
View file

@ -329,7 +329,6 @@ bool RemovableDriveManager::compare_filesystem_id(const std::string &path_a, con
dev_t id_b = buf.st_dev; dev_t id_b = buf.st_dev;
return id_a == id_b; return id_a == id_b;
} }
void RemovableDriveManager::eject_drive(const std::string &path) void RemovableDriveManager::eject_drive(const std::string &path)
{ {
if (m_current_drives.empty()) if (m_current_drives.empty())
@ -518,4 +517,3 @@ void RemovableDriveManager::reset_last_save_path()
m_last_save_path = ""; m_last_save_path = "";
} }
}}//namespace Slicer::Gui }}//namespace Slicer::Gui

1
src/slic3r/GUI/RemovableDriveManager.hpp
View file

@ -94,3 +94,4 @@ protected:
#endif #endif
}} }}
#endif #endif