Ver Fonte

UI: Disable and ignore Always On Top on Wayland platforms

This is a dangerous operation on Wayland, and is crashing not only
OBS Studio but also the whole compositor. Let's disable it for now
when running as a native Wayland client.

Some compositors (GNOME Shell, Plasma) still allow setting this
option on the window menu.
Georges Basile Stavracas Neto há 5 anos atrás
pai
commit
b629265e7f
1 ficheiros alterados com 18 adições e 1 exclusões
  1. 18 1
      UI/window-basic-main.cpp

+ 18 - 1
UI/window-basic-main.cpp

@@ -79,6 +79,10 @@
 
 
 #include <json11.hpp>
 #include <json11.hpp>
 
 
+#ifdef ENABLE_WAYLAND
+#include <obs-nix-platform.h>
+#endif
+
 using namespace json11;
 using namespace json11;
 using namespace std;
 using namespace std;
 
 
@@ -1865,9 +1869,22 @@ void OBSBasic::OBSInit()
 
 
 	bool alwaysOnTop = config_get_bool(App()->GlobalConfig(), "BasicWindow",
 	bool alwaysOnTop = config_get_bool(App()->GlobalConfig(), "BasicWindow",
 					   "AlwaysOnTop");
 					   "AlwaysOnTop");
-	if (alwaysOnTop || opt_always_on_top) {
+
+#ifdef ENABLE_WAYLAND
+	bool isWayland = obs_get_nix_platform() == OBS_NIX_PLATFORM_WAYLAND;
+#else
+	bool isWayland = false;
+#endif
+
+	if (!isWayland && (alwaysOnTop || opt_always_on_top)) {
 		SetAlwaysOnTop(this, true);
 		SetAlwaysOnTop(this, true);
 		ui->actionAlwaysOnTop->setChecked(true);
 		ui->actionAlwaysOnTop->setChecked(true);
+	} else if (isWayland) {
+		if (opt_always_on_top)
+			blog(LOG_INFO,
+			     "Always On Top not available on Wayland, ignoring…");
+		ui->actionAlwaysOnTop->setEnabled(false);
+		ui->actionAlwaysOnTop->setVisible(false);
 	}
 	}
 
 
 #ifndef _WIN32
 #ifndef _WIN32