From 3952fe2693bfabed29b5af3919360ad409f3d6d3 Mon Sep 17 00:00:00 2001
From: Shaolin <admshao@gmail.com>
Date: Wed, 28 Feb 2018 14:27:12 -0300
Subject: [PATCH] UI: Simplify Projector Init

---
 UI/window-projector.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/UI/window-projector.cpp b/UI/window-projector.cpp
index 5bd26e375..c6581ba73 100644
--- a/UI/window-projector.cpp
+++ b/UI/window-projector.cpp
@@ -135,25 +135,19 @@ static OBSSource CreateLabel(const char *name, size_t h)
 void OBSProjector::Init(int monitor, bool window, QString title,
 		ProjectorType type_)
 {
-	QScreen *screen = QGuiApplication::screens()[monitor];
-
-	if (!window)
-		setGeometry(screen->geometry());
-
 	bool alwaysOnTop = config_get_bool(GetGlobalConfig(),
 			"BasicWindow", "ProjectorAlwaysOnTop");
 	if (alwaysOnTop && !window)
 		SetAlwaysOnTop(this, true);
 
-	if (window)
-		setWindowTitle(title);
-
 	show();
 
-	if (source)
-		obs_source_inc_showing(source);
+	if (window) {
+		setWindowTitle(title);
+	} else {
+		QScreen *screen = QGuiApplication::screens()[monitor];
+		setGeometry(screen->geometry());
 
-	if (!window) {
 		QAction *action = new QAction(this);
 		action->setShortcut(Qt::Key_Escape);
 		addAction(action);
@@ -162,6 +156,9 @@ void OBSProjector::Init(int monitor, bool window, QString title,
 		activateWindow();
 	}
 
+	if (source)
+		obs_source_inc_showing(source);
+
 	savedMonitor = monitor;
 	isWindow     = window;
 	type         = type_;