From f3f648f920a9f4676a5cde98806fc7735119984c Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 30 May 2012 11:55:28 +0200 Subject: Fix QTemporaryFile::open() failing after remove(). If a QTemporaryFile is constructed using a template file path, the path is generated in QTemporaryFileEngine::open() and then filePathIsTemplate is set to false. If remove() and then open() are called on the same QTemporaryFile, the path is not regenerated. This change ensures that if the file path was generated, it will be generated again in the scenario above. Task-number: QTBUG-2557 Change-Id: I718ceb89daa9a9d46fdbe811fecc3d57d6dc08c2 Reviewed-by: Thiago Macieira --- src/corelib/io/qtemporaryfile.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index cb8b5dbefc..56b3d17dc1 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -223,7 +223,8 @@ class QTemporaryFileEngine : public QFSFileEngine Q_DECLARE_PRIVATE(QFSFileEngine) public: QTemporaryFileEngine(const QString &file, bool fileIsTemplate = true) - : QFSFileEngine(), filePathIsTemplate(fileIsTemplate) + : QFSFileEngine(), filePathIsTemplate(fileIsTemplate), + filePathWasTemplate(fileIsTemplate) { Q_D(QFSFileEngine); d->fileEntry = QFileSystemEntry(file); @@ -244,6 +245,7 @@ public: bool close(); bool filePathIsTemplate; + bool filePathWasTemplate; }; QTemporaryFileEngine::~QTemporaryFileEngine() @@ -379,6 +381,12 @@ bool QTemporaryFileEngine::remove() QFSFileEngine::close(); if (QFSFileEngine::remove()) { d->fileEntry.clear(); + // If a QTemporaryFile is constructed using a template file path, the path + // is generated in QTemporaryFileEngine::open() and then filePathIsTemplate + // is set to false. If remove() and then open() are called on the same + // QTemporaryFile, the path is not regenerated. Here we ensure that if the + // file path was generated, it will be generated again in the scenario above. + filePathIsTemplate = filePathWasTemplate; return true; } return false; -- cgit v1.2.3