diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-02 23:06:44 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-02 23:39:22 +0000 |
commit | 754efa57d89c62d1796e01b407e9222e67450f52 (patch) | |
tree | ebbe795a4067da7b1e75f5597de2373aaf4ba308 /src/corelib/io | |
parent | f44a59f390be9b67365db8796aa6a54fe9241028 (diff) | |
parent | 166c2499d989919a037a599942fb95beb362971e (diff) |
Merge "Merge remote-tracking branch 'origin/5.5.0' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qlockfile_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qlockfile_win.cpp b/src/corelib/io/qlockfile_win.cpp index 8cbe0a9dfd..5bd1ba04c9 100644 --- a/src/corelib/io/qlockfile_win.cpp +++ b/src/corelib/io/qlockfile_win.cpp @@ -132,7 +132,7 @@ bool QLockFilePrivate::isApparentlyStale() const // processes due to sandboxing #ifndef Q_OS_WINRT if (getLockInfo(&pid, &hostname, &appname)) { - if (hostname == QString::fromLocal8Bit(localHostName())) { + if (hostname.isEmpty() || hostname == QString::fromLocal8Bit(localHostName())) { HANDLE procHandle = ::OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); if (!procHandle) return true; |