|
@@ -117,15 +117,12 @@ OBSProjector::~OBSProjector()
|
|
}
|
|
}
|
|
|
|
|
|
App()->DecrementSleepInhibition();
|
|
App()->DecrementSleepInhibition();
|
|
-
|
|
|
|
- screen = nullptr;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
void OBSProjector::SetMonitor(int monitor)
|
|
void OBSProjector::SetMonitor(int monitor)
|
|
{
|
|
{
|
|
savedMonitor = monitor;
|
|
savedMonitor = monitor;
|
|
- screen = QGuiApplication::screens()[monitor];
|
|
|
|
- setGeometry(screen->geometry());
|
|
|
|
|
|
+ setGeometry(QGuiApplication::screens()[monitor]->geometry());
|
|
showFullScreen();
|
|
showFullScreen();
|
|
SetHideCursor();
|
|
SetHideCursor();
|
|
}
|
|
}
|
|
@@ -428,7 +425,6 @@ void OBSProjector::OpenWindowedProjector()
|
|
|
|
|
|
OBSSource source = GetSource();
|
|
OBSSource source = GetSource();
|
|
UpdateProjectorTitle(QT_UTF8(obs_source_get_name(source)));
|
|
UpdateProjectorTitle(QT_UTF8(obs_source_get_name(source)));
|
|
- screen = nullptr;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
void OBSProjector::ResizeToContent()
|
|
void OBSProjector::ResizeToContent()
|
|
@@ -486,11 +482,11 @@ void OBSProjector::SetIsAlwaysOnTop(bool isAlwaysOnTop, bool isOverridden)
|
|
SetAlwaysOnTop(this, isAlwaysOnTop);
|
|
SetAlwaysOnTop(this, isAlwaysOnTop);
|
|
}
|
|
}
|
|
|
|
|
|
-void OBSProjector::ScreenRemoved(QScreen *screen_)
|
|
|
|
|
|
+void OBSProjector::ScreenRemoved(QScreen *screen)
|
|
{
|
|
{
|
|
- if (GetMonitor() < 0 || !screen)
|
|
|
|
|
|
+ if (GetMonitor() < 0)
|
|
return;
|
|
return;
|
|
|
|
|
|
- if (screen == screen_)
|
|
|
|
|
|
+ if (screen == this->screen())
|
|
EscapeTriggered();
|
|
EscapeTriggered();
|
|
}
|
|
}
|