Skip to content

Commit 6ce0cbb

Browse files
committed
frontend: Remove unnecessary projector variable
This variable is not needed, as there is a screen() function.
1 parent ecb0381 commit 6ce0cbb

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

frontend/widgets/OBSProjector.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,12 @@ OBSProjector::~OBSProjector()
117117
}
118118

119119
App()->DecrementSleepInhibition();
120-
121-
screen = nullptr;
122120
}
123121

124122
void OBSProjector::SetMonitor(int monitor)
125123
{
126124
savedMonitor = monitor;
127-
screen = QGuiApplication::screens()[monitor];
128-
setGeometry(screen->geometry());
125+
setGeometry(QGuiApplication::screens()[monitor]->geometry());
129126
showFullScreen();
130127
SetHideCursor();
131128
}
@@ -428,7 +425,6 @@ void OBSProjector::OpenWindowedProjector()
428425

429426
OBSSource source = GetSource();
430427
UpdateProjectorTitle(QT_UTF8(obs_source_get_name(source)));
431-
screen = nullptr;
432428
}
433429

434430
void OBSProjector::ResizeToContent()
@@ -486,11 +482,11 @@ void OBSProjector::SetIsAlwaysOnTop(bool isAlwaysOnTop, bool isOverridden)
486482
SetAlwaysOnTop(this, isAlwaysOnTop);
487483
}
488484

489-
void OBSProjector::ScreenRemoved(QScreen *screen_)
485+
void OBSProjector::ScreenRemoved(QScreen *screen)
490486
{
491-
if (GetMonitor() < 0 || !screen)
487+
if (GetMonitor() < 0)
492488
return;
493489

494-
if (screen == screen_)
490+
if (screen == this->screen())
495491
EscapeTriggered();
496492
}

frontend/widgets/OBSProjector.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,13 @@ class OBSProjector : public OBSQTDisplay {
4343
QRect prevGeometry;
4444
void SetMonitor(int monitor);
4545

46-
QScreen *screen = nullptr;
47-
4846
private slots:
4947
void EscapeTriggered();
5048
void OpenFullScreenProjector();
5149
void ResizeToContent();
5250
void OpenWindowedProjector();
5351
void AlwaysOnTopToggled(bool alwaysOnTop);
54-
void ScreenRemoved(QScreen *screen_);
52+
void ScreenRemoved(QScreen *screen);
5553
void RenameProjector(QString oldName, QString newName);
5654

5755
public:

0 commit comments

Comments
 (0)