diff options
Diffstat (limited to 'src/slic3r/GUI/GUI_App.hpp')
| -rw-r--r-- | src/slic3r/GUI/GUI_App.hpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index b1b0a7786..9c65bc024 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -341,8 +341,9 @@ public: private: bool on_init_inner(); void init_app_config(); - bool check_older_app_config(Semver current_version, bool backup); - void copy_older_config(); + // returns old config path to copy from if such exists, + // returns an empty string if such config path does not exists or if it cannot be loaded. + std::string check_older_app_config(Semver current_version, bool backup); void window_pos_save(wxTopLevelWindow* window, const std::string &name); void window_pos_restore(wxTopLevelWindow* window, const std::string &name, bool default_maximized = false); void window_pos_sanitize(wxTopLevelWindow* window); @@ -351,10 +352,7 @@ private: bool config_wizard_startup(); void check_updates(const bool verbose); - bool m_init_app_config_from_older { false }; - bool m_datadir_redefined { false }; - std::string m_older_data_dir_path; - boost::optional<Semver> m_last_config_version; + bool m_datadir_redefined { false }; }; DECLARE_APP(GUI_App) |