From 8cd56cf68d29fbf968f80d940962ce9f2d107fd7 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 4 Jun 2013 18:01:47 +0200 Subject: [PATCH] Make sure to call FileSaver::finalize We may leak resources otherwise. Change-Id: Ic09f58bd47cbf283e22f17f2c3393ca03c5dfacf Reviewed-by: Oswald Buddenhagen --- src/libs/utils/textfileformat.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/textfileformat.cpp b/src/libs/utils/textfileformat.cpp index c4c33cd6521..62f22bb964e 100644 --- a/src/libs/utils/textfileformat.cpp +++ b/src/libs/utils/textfileformat.cpp @@ -289,13 +289,11 @@ bool TextFileFormat::writeFile(const QString &fileName, QString plainText, QStri } Utils::FileSaver saver(fileName, fileMode); - if (saver.hasError()) { - *errorString = saver.errorString(); - return false; + if (!saver.hasError()) { + if (hasUtf8Bom && codec->name() == "UTF-8") + saver.write("\xef\xbb\xbf", 3); + saver.write(codec->fromUnicode(plainText)); } - if (hasUtf8Bom && codec->name() == "UTF-8") - saver.write("\xef\xbb\xbf", 3); - saver.write(codec->fromUnicode(plainText)); const bool ok = saver.finalize(errorString); if (debug) qDebug().nospace() << Q_FUNC_INFO << fileName << ' ' << *this << ' ' << plainText.size()