Skip to content

frontend: Fix exit from tray context menu #13621

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

Open
zorbathut wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −0
Open

frontend: Fix exit from tray context menu #13621

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
17 changes: 17 additions & 0 deletions frontend/widgets/OBSBasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1708,6 +1708,23 @@ void OBSBasic::close()
return;
}

// qt glitch workaround, wayland-specific:
//
// if a window has been created but never shown, QWindow has no instantiated QPlatformWindow
// this causes QWindow::close() to report success without actually closing
// this means the handleClose fallback in QWidgetPrivate::close() gets skipped and nothing gets closed
//
// so we do it manually instead
//
// we don't want to do this *by default* because then we'd skip UI cleanup in the normal close path
// which doesn't matter if there's no UI to clean up, though!
QWindow *window = windowHandle();
if (window && !window->handle()) {
QCloseEvent closeEvent;
QApplication::sendEvent(this, &closeEvent);
return;
}

OBSMainWindow::close();
}

Expand Down