summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qlockfile_unix.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/io/qlockfile_unix.cpp')
-rw-r--r--src/corelib/io/qlockfile_unix.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/corelib/io/qlockfile_unix.cpp b/src/corelib/io/qlockfile_unix.cpp
index 7255414bdc..03dc5fc660 100644
--- a/src/corelib/io/qlockfile_unix.cpp
+++ b/src/corelib/io/qlockfile_unix.cpp
@@ -151,12 +151,14 @@ static bool fcntlWorksAfterFlock(const QString &fn)
if (fcntlOK.isDestroyed())
return QLockFilePrivate::checkFcntlWorksAfterFlock(fn);
bool *worksPtr = fcntlOK->object(fn);
- if (!worksPtr) {
- worksPtr = new bool(QLockFilePrivate::checkFcntlWorksAfterFlock(fn));
- fcntlOK->insert(fn, worksPtr);
- }
+ if (worksPtr)
+ return *worksPtr;
+
+ const bool val = QLockFilePrivate::checkFcntlWorksAfterFlock(fn);
+ worksPtr = new bool(val);
+ fcntlOK->insert(fn, worksPtr);
- return *worksPtr;
+ return val;
}
static bool setNativeLocks(const QString &fileName, int fd)