Skip to content

Commit 423d3df

Browse files
committed
frontend: Update parent logic for systray menu projector items
Adding some more cleanup with Qt Widget/Object parenting and manual deletes.
1 parent 336261c commit 423d3df

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

frontend/widgets/OBSBasic.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,8 +1407,6 @@ void OBSBasic::applicationShutdown() noexcept
14071407
patronJsonThread->wait();
14081408

14091409
delete screenshotData;
1410-
delete previewProjector;
1411-
delete studioProgramProjector;
14121410
delete previewProjectorSource;
14131411
delete previewProjectorMain;
14141412
delete sourceProjector;

frontend/widgets/OBSBasic_SysTray.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ void OBSBasic::SystemTrayInit()
4747
trayMenu);
4848
exit = new QAction(QTStr("Exit"), trayMenu);
4949

50-
previewProjector = new QMenu(QTStr("Projector.Open.Preview"));
51-
studioProgramProjector = new QMenu(QTStr("Projector.Open.Program"));
50+
previewProjector = new QMenu(QTStr("Projector.Open.Preview"), trayMenu);
51+
studioProgramProjector = new QMenu(QTStr("Projector.Open.Program"), trayMenu);
5252
OBSBasic::updateSysTrayProjectorMenu();
5353

5454
trayMenu->addAction(showHide);

0 commit comments

Comments
 (0)