Fix Windows FramelessHelperHookWindowProc crash (#305)

Application can crash on Windows in the FramelessHelperHookWindowProc callback if the underlying FramelessQuickHelper* has already been deleted. This protects against that crash by using a QPointer to invalidate the instance if it has been deleted which the callback then guards against.
This commit is contained in:
haikü 2023-10-29 10:38:23 +00:00 committed by GitHub
parent c4a7bc80d0
commit 46ac2f684d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions

View File

@ -185,6 +185,7 @@ void FramelessQuickHelperPrivate::attach()
}
if (!data->callbacks) {
QPointer<QWindow> w = window;
data->callbacks = FramelessCallbacks::create();
data->callbacks->getWindowId = [window]() -> WId { return window->winId(); };
data->callbacks->getWindowFlags = [window]() -> Qt::WindowFlags { return window->flags(); };
@ -198,7 +199,7 @@ void FramelessQuickHelperPrivate::attach()
data->callbacks->setWindowFixedSize = [q](const bool value) -> void { q->setWindowFixedSize(value); };
data->callbacks->getWindowState = [window]() -> Qt::WindowState { return window->windowState(); };
data->callbacks->setWindowState = [window](const Qt::WindowState state) -> void { window->setWindowState(state); };
data->callbacks->getWindowHandle = [q]() -> QWindow * { return q->window(); };
data->callbacks->getWindowHandle = [w]() -> QWindow * { return w; };
data->callbacks->windowToScreen = [window](const QPoint &pos) -> QPoint { return window->mapToGlobal(pos); };
data->callbacks->screenToWindow = [window](const QPoint &pos) -> QPoint { return window->mapFromGlobal(pos); };
data->callbacks->isInsideSystemButtons = [this](const QPoint &pos, SystemButtonType *button) -> bool {