Skip to content

Commit

Permalink
fix: RunGuard not works on Qt6 (#1095)
Browse files Browse the repository at this point in the history
* Revert "fix: RunGuard not works on Qt6"

This reverts commit 32ef100.

* fix: RunGuard not works on Qt6
  • Loading branch information
BlacAmDK authored Dec 5, 2023
1 parent beb8735 commit 1b078a8
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions 3rdparty/RunGuard.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,34 +58,25 @@ RunGuard::~RunGuard() {
}

bool RunGuard::isAnotherRunning(quint64 *data_out) {
if (sharedMem.isAttached()) {
if (sharedMem.isAttached())
return false;
}

memLock.acquire();
const bool isRunning = sharedMem.create(sizeof(quint64));if (!isRunning) {
const bool isRunning = sharedMem.attach();
if (isRunning) {
if (data_out != nullptr) {
memcpy(data_out, sharedMem.data(), sizeof(quint64));
}
sharedMem.detach();
}
memLock.release();

return !isRunning;
return isRunning;
}


bool RunGuard::tryToRun(quint64 *data_in) {
if (isAnotherRunning(nullptr)) // Extra check
return false;

memLock.acquire();

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;

const bool result = sharedMem.create(sizeof(quint64));
if (result) memcpy(sharedMem.data(), data_in, sizeof(quint64));
memLock.release();

Expand Down

0 comments on commit 1b078a8

Please sign in to comment.