parent
6490456ec4
commit
091585076c
@ -884,7 +884,7 @@ void GUI_App::init_app_config()
|
|||||||
set_data_dir((dir + "/" + GetAppName()).ToUTF8().data());
|
set_data_dir((dir + "/" + GetAppName()).ToUTF8().data());
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
m_config_folder_redefined = true;
|
m_datadir_redefined = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!app_config)
|
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)
|
bool GUI_App::check_older_app_config(Semver current_version, bool backup)
|
||||||
{
|
{
|
||||||
// If the config folder is redefined - do not check
|
// If the config folder is redefined - do not check
|
||||||
if (m_config_folder_redefined)
|
if (m_datadir_redefined)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// find other version app config (alpha / beta / release)
|
// find other version app config (alpha / beta / release)
|
||||||
|
@ -352,7 +352,7 @@ private:
|
|||||||
void check_updates(const bool verbose);
|
void check_updates(const bool verbose);
|
||||||
|
|
||||||
bool m_init_app_config_from_older { false };
|
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;
|
std::string m_older_data_dir_path;
|
||||||
boost::optional<Semver> m_last_config_version;
|
boost::optional<Semver> m_last_config_version;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user