From 2c1073eda9e1be612bf1ca7ed057b3284c6e6b54 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Tue, 14 Feb 2023 11:45:32 +0100 Subject: [PATCH] fix: Safety backup restore popup getting hidden by tip of the day --- lib/external/pattern_language | 2 +- plugins/builtin/source/content/welcome_screen.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/external/pattern_language b/lib/external/pattern_language index 0999ae326..dd4c2b262 160000 --- a/lib/external/pattern_language +++ b/lib/external/pattern_language @@ -1 +1 @@ -Subproject commit 0999ae32658d8ec5e1ec4b2f091e53bc879d9de3 +Subproject commit dd4c2b2620a77397c42354ef7685241a9f510aa4 diff --git a/plugins/builtin/source/content/welcome_screen.cpp b/plugins/builtin/source/content/welcome_screen.cpp index f8e8014e6..8d863cff1 100644 --- a/plugins/builtin/source/content/welcome_screen.cpp +++ b/plugins/builtin/source/content/welcome_screen.cpp @@ -548,7 +548,6 @@ namespace hex::plugin::builtin { } }); - constexpr static auto CrashBackupFileName = "crash_backup.hexproj"; for (const auto &path : fs::getDefaultPaths(fs::ImHexPath::Config)) { if (auto filePath = std::fs::path(path) / CrashBackupFileName; fs::exists(filePath)) { @@ -558,7 +557,7 @@ namespace hex::plugin::builtin { } auto tipsData = romfs::get("tips.json"); - if(tipsData.valid()){ + if(s_safetyBackupPath.empty() && tipsData.valid()){ auto tipsCategories = nlohmann::json::parse(tipsData.string()); auto now = std::chrono::system_clock::now();