Skip to content

Disable the Qt6.9 workaround for Mutex and ConditionVariable. #1391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mysticial merged 1 commit into from
Aug 16, 2026
Merged

Disable the Qt6.9 workaround for Mutex and ConditionVariable. #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Common/Cpp/Concurrency/ConditionVariable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
#ifndef PokemonAutomation_Concurrency_ConditionVariable_H
#define PokemonAutomation_Concurrency_ConditionVariable_H

#include <mutex>
#include "Qt6.9ThreadBugWorkaround.h"

#ifdef PA_ENABLE_QT_ADOPTION_WORKAROUND
// Note from Kuro (2026/08/15): I think it's ok to disable this workaround for
// mutex and conditional_variable since we're completely leaking the thread.
// So the parasitic adoption should dangle these sync classes.
#if 0 //def PA_ENABLE_QT_ADOPTION_WORKAROUND

#include <mutex>
#include <QWaitCondition>

//#include <iostream>
Expand Down
5 changes: 4 additions & 1 deletion Common/Cpp/Concurrency/Mutex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@

#include "Qt6.9ThreadBugWorkaround.h"

#ifdef PA_ENABLE_QT_ADOPTION_WORKAROUND
// Note from Kuro (2026/08/15): I think it's ok to disable this workaround for
// mutex and conditional_variable since we're completely leaking the thread.
// So the parasitic adoption should dangle these sync classes.
#if 0 //def PA_ENABLE_QT_ADOPTION_WORKAROUND

#include <mutex>
#include <QMutex>
Expand Down
Loading