Catchup
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git a/UI/window-projector.cpp b/UI/window-projector.cpp
|
||||
index e61f23182..a405e9f17 100644
|
||||
--- a/UI/window-projector.cpp
|
||||
+++ b/UI/window-projector.cpp
|
||||
@@ -37,11 +37,6 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
|
||||
diff --git a/frontend/widgets/OBSProjector.cpp b/frontend/widgets/OBSProjector.cpp
|
||||
index cc214ea..79b0120 100644
|
||||
--- a/frontend/widgets/OBSProjector.cpp
|
||||
+++ b/frontend/widgets/OBSProjector.cpp
|
||||
@@ -36,11 +36,6 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
|
||||
// can skip it
|
||||
windowHandle()->setProperty("isOBSProjectorWindow", true);
|
||||
|
||||
@@ -12,5 +12,5 @@ index e61f23182..a405e9f17 100644
|
||||
-#endif
|
||||
-
|
||||
type = type_;
|
||||
#ifdef __APPLE__
|
||||
setWindowIcon(
|
||||
#ifndef __APPLE__
|
||||
setWindowIcon(QIcon::fromTheme("obs", QIcon(":/res/images/obs.png")));
|
||||
|
||||
Reference in New Issue
Block a user