merge
This commit is contained in:
commit
81a2f8535a
4 changed files with 3 additions and 5 deletions
|
@ -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");
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -93,4 +93,5 @@ protected:
|
|||
};
|
||||
#endif
|
||||
}}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue