From d2a29c2f876b0c2859ce3331a304b1899018966f Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 14 Jul 2022 13:05:08 +0800 Subject: [PATCH] Correctly remove incomplete settings file PR #17362. --- src/base/settingsstorage.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/base/settingsstorage.cpp b/src/base/settingsstorage.cpp index ed7071877..da3c9d374 100644 --- a/src/base/settingsstorage.cpp +++ b/src/base/settingsstorage.cpp @@ -188,10 +188,13 @@ bool SettingsStorage::writeNativeSettings() const break; } - if (nativeSettings->status() != QSettings::NoError) - return false; - const Path newPath {nativeSettings->fileName()}; + if (nativeSettings->status() != QSettings::NoError) + { + Utils::Fs::removeFile(newPath); + return false; + } + QString finalPathStr = newPath.data(); const int index = finalPathStr.lastIndexOf(u"_new", -1, Qt::CaseInsensitive); finalPathStr.remove(index, 4);