Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kocik <kocikdav@gmail.com>2019-11-26 16:19:29 +0300
committerDavid Kocik <kocikdav@gmail.com>2019-12-13 16:54:25 +0300
commitf3ecf55d3840634941a0f9b053516d20a183a6a5 (patch)
tree02b3e29cd023e22bec13cc70ca2e0b4093272f53 /src/slic3r/GUI/AppConfig.cpp
parentacab61fa5430ae3c983e9c08e5ff1e7159319af1 (diff)
removable drive manager - Windows part
Diffstat (limited to 'src/slic3r/GUI/AppConfig.cpp')
-rw-r--r--src/slic3r/GUI/AppConfig.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/slic3r/GUI/AppConfig.cpp b/src/slic3r/GUI/AppConfig.cpp
index 705582251..f24bde242 100644
--- a/src/slic3r/GUI/AppConfig.cpp
+++ b/src/slic3r/GUI/AppConfig.cpp
@@ -21,6 +21,7 @@
#include <wx/string.h>
#include "I18N.hpp"
+#include "RemovableDriveManager.hpp"
namespace Slic3r {
@@ -357,7 +358,14 @@ void AppConfig::update_skein_dir(const std::string &dir)
std::string AppConfig::get_last_output_dir(const std::string &alt) const
{
+<<<<<<< HEAD
+=======
+ if (GUI::RemovableDriveManager::getInstance().update())
+ {
+ return GUI::RemovableDriveManager::getInstance().getLastDrivePath();
+ }
+>>>>>>> removable drive manager - Windows part
const auto it = m_storage.find("");
if (it != m_storage.end()) {
const auto it2 = it->second.find("last_output_path");