From 2e9604c0920701ba32f058ceebb11d72292a1dff Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 2 Jul 2021 15:37:12 +0200 Subject: [PATCH] Utils: Do not save file upon PersistentSettingsWriter destruction The m_savedData member is set on two occasions: Once directly after reading the same file that is going to be written, and once directly after a successful file save. In neither case do we have to write it out again. Fixes: QTCREATORBUG-25921 Change-Id: Ie369e280f4189aefb6b2ad291426ee9e6f1ed16d Reviewed-by: Eike Ziller --- src/libs/utils/persistentsettings.cpp | 5 ----- src/libs/utils/persistentsettings.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp index eda01977de0..4cebb43c7ca 100644 --- a/src/libs/utils/persistentsettings.cpp +++ b/src/libs/utils/persistentsettings.cpp @@ -427,11 +427,6 @@ PersistentSettingsWriter::PersistentSettingsWriter(const FilePath &fileName, con m_fileName(fileName), m_docType(docType) { } -PersistentSettingsWriter::~PersistentSettingsWriter() -{ - write(m_savedData, nullptr); -} - bool PersistentSettingsWriter::save(const QVariantMap &data, QString *errorString) const { if (data == m_savedData) diff --git a/src/libs/utils/persistentsettings.h b/src/libs/utils/persistentsettings.h index 92dbf0d8c98..20802ea2630 100644 --- a/src/libs/utils/persistentsettings.h +++ b/src/libs/utils/persistentsettings.h @@ -52,7 +52,6 @@ class QTCREATOR_UTILS_EXPORT PersistentSettingsWriter { public: PersistentSettingsWriter(const FilePath &fileName, const QString &docType); - ~PersistentSettingsWriter(); bool save(const QVariantMap &data, QString *errorString) const; #ifdef QT_GUI_LIB