Northern_Lights/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-21 16:30:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: RunGuard not works on Qt6 (#1095)

Browse Source 
* Revert "fix: RunGuard not works on Qt6"

This reverts commit 32ef100cf3.

* fix: RunGuard not works on Qt6
This commit is contained in:
BlacAmDK 2023-12-05 22:17:54 +08:00 committed by GitHub
parent beb87352ae
commit 1b078a8aab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
3rdparty/RunGuard.hpp vendored
View File

@ -58,12 +58,12 @@ RunGuard::~RunGuard() {
} }
bool RunGuard::isAnotherRunning(quint64 *data_out) { bool RunGuard::isAnotherRunning(quint64 *data_out) {
if (sharedMem.isAttached()) { if (sharedMem.isAttached())
return false; return false;
}
memLock.acquire(); memLock.acquire();
const bool isRunning = sharedMem.create(sizeof(quint64));if (!isRunning) { const bool isRunning = sharedMem.attach();
if (isRunning) {
if (data_out != nullptr) { if (data_out != nullptr) {
memcpy(data_out, sharedMem.data(), sizeof(quint64)); memcpy(data_out, sharedMem.data(), sizeof(quint64));
} }
@ -71,21 +71,12 @@ bool RunGuard::isAnotherRunning(quint64 *data_out) {
} }
memLock.release(); memLock.release();
return !isRunning; return isRunning;
} }
bool RunGuard::tryToRun(quint64 *data_in) { bool RunGuard::tryToRun(quint64 *data_in) {
if (isAnotherRunning(nullptr)) // Extra check
return false;
memLock.acquire(); memLock.acquire();
const bool result = sharedMem.create(sizeof(quint64));
bool result = sharedMem.attach();
// if success attach, attach return false but the error is NoError, magic, love from qt6
// qt docs: If false is returned, call error() to determine which error occurred.
if (!result) if (sharedMem.error() == QSharedMemory::NoError) result = true;
if (result) memcpy(sharedMem.data(), data_in, sizeof(quint64)); if (result) memcpy(sharedMem.data(), data_in, sizeof(quint64));
memLock.release(); memLock.release();