diff options
author | Saturneric <[email protected]> | 2022-12-22 10:30:36 +0000 |
---|---|---|
committer | Saturneric <[email protected]> | 2022-12-22 10:30:36 +0000 |
commit | 3cb623b07e50d9e95dace9966dc0337e72f57dc2 (patch) | |
tree | dfe994f28f0a6dee6151febf3b50f22adceab74e /src/core/function/GlobalSettingStation.h | |
parent | Merge pull request #70 from saturneric/dev/2.0.8/saturneric (diff) | |
parent | fix: continue to solve ubuntu 18.04 build issues (diff) | |
download | GpgFrontend-2.0.10.tar.gz GpgFrontend-2.0.10.zip |
fix: solve conflictsv2.0.10
Diffstat (limited to 'src/core/function/GlobalSettingStation.h')
-rw-r--r-- | src/core/function/GlobalSettingStation.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/function/GlobalSettingStation.h b/src/core/function/GlobalSettingStation.h index 58282466..8811623f 100644 --- a/src/core/function/GlobalSettingStation.h +++ b/src/core/function/GlobalSettingStation.h @@ -173,10 +173,9 @@ class GPGFRONTEND_CORE_EXPORT GlobalSettingStation QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) .toStdString(); ///< Program Configure Location std::filesystem::path ui_config_dir_path_ = - app_configure_path_ / - "UserInterface"; ///< Configure File Directory Location + app_configure_path_ / "conf"; ///< Configure File Directory Location std::filesystem::path ui_config_path_ = - ui_config_dir_path_ / "ui.cfg"; ///< UI Configure File Location + ui_config_dir_path_ / "main.cfg"; ///< Main Configure File Location libconfig::Config ui_cfg_; ///< UI Configure File |