From 091585076c5009b1173ee240cf0fef7ecba876dc Mon Sep 17 00:00:00 2001 From: David Kocik Date: Mon, 6 Dec 2021 17:24:54 +0100 Subject: [PATCH] Followup on 6490456ec401f05036289897f14dc82e27714ceb Rename variable --- src/slic3r/GUI/GUI_App.cpp | 4 ++-- src/slic3r/GUI/GUI_App.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 20a4505d7..bda7394ed 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -884,7 +884,7 @@ void GUI_App::init_app_config() set_data_dir((dir + "/" + GetAppName()).ToUTF8().data()); #endif } else { - m_config_folder_redefined = true; + m_datadir_redefined = true; } if (!app_config) @@ -918,7 +918,7 @@ void GUI_App::init_app_config() bool GUI_App::check_older_app_config(Semver current_version, bool backup) { // If the config folder is redefined - do not check - if (m_config_folder_redefined) + if (m_datadir_redefined) return false; // find other version app config (alpha / beta / release) diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 4cfc96816..b1b0a7786 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -352,7 +352,7 @@ private: void check_updates(const bool verbose); bool m_init_app_config_from_older { false }; - bool m_config_folder_redefined { false }; + bool m_datadir_redefined { false }; std::string m_older_data_dir_path; boost::optional m_last_config_version; };