From 7fba62bc49ad2c1d22dc221af778c51b8f26b4cf Mon Sep 17 00:00:00 2001 From: brunoherbelin Date: Sun, 25 Oct 2020 22:03:49 +0100 Subject: [PATCH] minor rename --- Settings.cpp | 7 +++++-- Settings.h | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Settings.cpp b/Settings.cpp index e68f760..da9174b 100644 --- a/Settings.cpp +++ b/Settings.cpp @@ -12,6 +12,7 @@ using namespace tinyxml2; Settings::Application Settings::application; + static string settingsFilename = ""; void Settings::Save() @@ -387,11 +388,12 @@ void Settings::Load() } + void Settings::Lock() { - application.first_instance = false; std::string lockfile = SystemToolkit::full_filename(SystemToolkit::settings_path(), "lock"); + application.fresh_start = false; FILE *file = fopen(lockfile.c_str(), "r"); int l = 0; @@ -406,8 +408,8 @@ void Settings::Lock() if (file) { fprintf(file, "1"); fclose(file); - application.first_instance = true; } + application.fresh_start = true; } } @@ -434,3 +436,4 @@ void Settings::Check() xmlDoc.Print(); } + diff --git a/Settings.h b/Settings.h index a663ffd..2fee106 100644 --- a/Settings.h +++ b/Settings.h @@ -162,7 +162,7 @@ struct SourceConfig struct Application { // instance check - bool first_instance; + bool fresh_start; // Verification std::string name; @@ -204,7 +204,7 @@ struct Application History recentFolders; History recentImport; - Application() : first_instance(false), name(APP_NAME){ + Application() : fresh_start(false), name(APP_NAME){ scale = 1.f; accent_color = 0; pannel_stick = false;