Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make setNativeLocks() non-fatal on OS X.

Browse Source
This commit is contained in:
Felix Geyer 2015-07-21 23:12:20 +02:00
parent ceeb72a277
commit af3d896bdf
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/qlockfile_unix.cpp
View File

@ -169,7 +169,13 @@ bool QLockFilePrivate::removeStaleLock()
const int fd = qt_safe_open(lockFileName.constData(), O_WRONLY, 0644); const int fd = qt_safe_open(lockFileName.constData(), O_WRONLY, 0644);
if (fd < 0) // gone already? if (fd < 0) // gone already?
return false; return false;
#ifdef Q_OS_MAC
// ugly workaround: ignore setNativeLocks() result on Mac since it's broken there
setNativeLocks(fd);
bool success = (::unlink(lockFileName) == 0);
#else
bool success = setNativeLocks(fd) && (::unlink(lockFileName) == 0); bool success = setNativeLocks(fd) && (::unlink(lockFileName) == 0);
#endif
close(fd); close(fd);
return success; return success;
} }