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

prev commit linux part

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -357,18 +357,6 @@ void AppConfig::update_skein_dir(const std::string &dir)
std::string AppConfig::get_last_output_dir(const std::string &alt) const
{
<<<<<<< HEAD
<<<<<<< HEAD
=======
if (GUI::RemovableDriveManager::getInstance().update())
{
return GUI::RemovableDriveManager::getInstance().get_last_drive_path();
}
>>>>>>> removable drive manager - Windows part
=======
>>>>>>> check if last path is on rem drive
const auto it = m_storage.find("");
if (it != m_storage.end()) {
const auto it2 = it->second.find("last_output_path");