opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-21 04:37:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

frontend: Fix unclean shutdown on Windows

Browse Source 
This issue was brought back by a somewhat recent change to fix slow
shutdown times in Linux.

To paraphrase tfo from the OBS Discord:
"I think the issue is that all the tray actions are parented to
trayIcon, so when it's deleted, Qt auto deletes them as children, then
delete trayMenu on the next line accesses those dead actions."

We now create the tray menu first, then setting the parent of the
actions (show / hide, stop / start streaming, etc.) to the tray menu.
This commit is contained in:
Lordmau5
2026-02-24 18:55:26 -05:00
committed by Ryan Foster
parent acd4c97873
commit c1f8cbb9d5
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/widgets/OBSBasic_SysTray.cpp
+10 -12
View File
@@ -32,22 +32,20 @@ void OBSBasic::SystemTrayInit()
trayIcon = new QSystemTrayIcon(QIcon::fromTheme("obs-tray", trayIconFile), this);
trayIcon->setToolTip("OBS Studio");
showHide = new QAction(QTStr("Basic.SystemTray.Show"), trayIcon.data());
sysTrayStream =
new QAction(StreamingActive() ? QTStr("Basic.Main.StopStreaming") : QTStr("Basic.Main.StartStreaming"),
trayIcon.data());
sysTrayRecord =
new QAction(RecordingActive() ? QTStr("Basic.Main.StopRecording") : QTStr("Basic.Main.StartRecording"),
trayIcon.data());
trayMenu = new QMenu;
showHide = new QAction(QTStr("Basic.SystemTray.Show"), trayMenu);
sysTrayStream = new QAction(
StreamingActive() ? QTStr("Basic.Main.StopStreaming") : QTStr("Basic.Main.StartStreaming"), trayMenu);
sysTrayRecord = new QAction(
RecordingActive() ? QTStr("Basic.Main.StopRecording") : QTStr("Basic.Main.StartRecording"), trayMenu);
sysTrayReplayBuffer = new QAction(ReplayBufferActive() ? QTStr("Basic.Main.StopReplayBuffer")
: QTStr("Basic.Main.StartReplayBuffer"),
trayIcon.data());
trayMenu);
sysTrayVirtualCam = new QAction(VirtualCamActive() ? QTStr("Basic.Main.StopVirtualCam")
: QTStr("Basic.Main.StartVirtualCam"),
trayIcon.data());
exit = new QAction(QTStr("Exit"), trayIcon.data());
trayMenu = new QMenu;
trayMenu);
exit = new QAction(QTStr("Exit"), trayMenu);
previewProjector = new QMenu(QTStr("Projector.Open.Preview"));
studioProgramProjector = new QMenu(QTStr("Projector.Open.Program"));