mirror of
https://github.com/obsproject/obs-studio.git
synced 2026-10-21 13:34:56 -04:00
UI: Fix preview/program projectors being swapped
If a preview projector was created in normal mode, it would become a studio projector in studio mode. The window title of the window projector would reflect that it was in fact a preview projector and not a program projector.
This commit is contained in:
1 parent
60e1d7e90b
commit
6461b63623
3 files changed
+11
-28
No files matched your search
@@ -3733,23 +3733,15 @@ void OBSBasic::CreateSourcePopupMenu(QListWidgetItem *item, bool preview)
|
||||
popup.addAction(ui->actionLockPreview);
|
||||
popup.addMenu(ui->scalingMenu);
|
||||
|
||||
const char *slot = IsPreviewProgramMode()
|
||||
? SLOT(OpenStudioProgramProjector())
|
||||
: SLOT(OpenPreviewProjector());
|
||||
|
||||
previewProjector = new QMenu(QTStr("PreviewProjector"));
|
||||
AddProjectorMenuMonitors(previewProjector, this,
|
||||
slot);
|
||||
SLOT(OpenPreviewProjector()));
|
||||
|
||||
popup.addMenu(previewProjector);
|
||||
|
||||
slot = IsPreviewProgramMode()
|
||||
? SLOT(OpenStudioProgramWindow())
|
||||
: SLOT(OpenPreviewWindow());
|
||||
|
||||
QAction *previewWindow = popup.addAction(
|
||||
QTStr("PreviewWindow"),
|
||||
this, slot);
|
||||
this, SLOT(OpenPreviewWindow()));
|
||||
|
||||
popup.addAction(previewWindow);
|
||||
|
||||
@@ -4951,13 +4943,13 @@ void OBSBasic::on_program_customContextMenuRequested(const QPoint&)
|
||||
studioProgramProjector = new QMenu(
|
||||
QTStr("StudioProgramProjector"));
|
||||
AddProjectorMenuMonitors(studioProgramProjector, this,
|
||||
SLOT(OpenPreviewProjector()));
|
||||
SLOT(OpenStudioProgramProjector()));
|
||||
|
||||
popup.addMenu(studioProgramProjector);
|
||||
|
||||
QAction *studioProgramWindow = popup.addAction(
|
||||
QTStr("StudioProgramWindow"),
|
||||
this, SLOT(OpenPreviewWindow()));
|
||||
this, SLOT(OpenStudioProgramWindow()));
|
||||
|
||||
popup.addAction(studioProgramWindow);
|
||||
|
||||
|
||||
Reference in new issue
Block a user