diff options
| author | David Kocik <kocikdav@gmail.com> | 2019-11-27 15:30:45 +0300 |
|---|---|---|
| committer | David Kocik <kocikdav@gmail.com> | 2019-12-13 17:07:35 +0300 |
| commit | 1ec7fc23e24b7d981b513d52a039201f2cac506f (patch) | |
| tree | de768c451576c4d5cf611221cc209c52796f39fa /src/slic3r/GUI/AppConfig.cpp | |
| parent | 72f1adbb443a37cd2ffc9f005e63549f032085c0 (diff) | |
check if last path is on rem drive
Diffstat (limited to 'src/slic3r/GUI/AppConfig.cpp')
| -rw-r--r-- | src/slic3r/GUI/AppConfig.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/slic3r/GUI/AppConfig.cpp b/src/slic3r/GUI/AppConfig.cpp index 9f294a3b6..e27fa1be6 100644 --- a/src/slic3r/GUI/AppConfig.cpp +++ b/src/slic3r/GUI/AppConfig.cpp @@ -21,7 +21,6 @@ #include <wx/string.h> #include "I18N.hpp" -#include "RemovableDriveManager.hpp" namespace Slic3r { @@ -359,6 +358,7 @@ 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()) @@ -366,6 +366,9 @@ std::string AppConfig::get_last_output_dir(const std::string &alt) const 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"); |