44 lines
1.0 KiB
Diff
44 lines
1.0 KiB
Diff
|
From 0ccb3579b3e8a2f86ac29da9695b91374cfd96c4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Crider <gloriouseggroll@gmail.com>
|
||
|
|
Date: Fri, 22 Dec 2023 18:25:09 -0500
|
||
|
|
Subject: [PATCH] Revert "Disable browser panels on Wayland"
|
||
|
|
|
||
|
|
This reverts commit 7402271392a6a74fb49f16d84fb3c04c1b603d9a.
|
||
|
|
---
|
||
|
|
panel/browser-panel.hpp | 12 ------------
|
||
|
|
1 file changed, 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/panel/browser-panel.hpp b/panel/browser-panel.hpp
|
||
|
|
index dd61f38..5fb9d35 100644
|
||
|
|
--- a/panel/browser-panel.hpp
|
||
|
|
+++ b/panel/browser-panel.hpp
|
||
|
|
@@ -12,10 +12,6 @@
|
||
|
|
#include <dlfcn.h>
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#ifdef ENABLE_WAYLAND
|
||
|
|
-#include <obs-nix-platform.h>
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
struct QCefCookieManager {
|
||
|
|
virtual ~QCefCookieManager() {}
|
||
|
|
|
||
|
|
@@ -81,14 +77,6 @@ struct QCef {
|
||
|
|
|
||
|
|
static inline void *get_browser_lib()
|
||
|
|
{
|
||
|
|
- // Disable panels on Wayland for now
|
||
|
|
- bool isWayland = false;
|
||
|
|
-#ifdef ENABLE_WAYLAND
|
||
|
|
- isWayland = obs_get_nix_platform() == OBS_NIX_PLATFORM_WAYLAND;
|
||
|
|
-#endif
|
||
|
|
- if (isWayland)
|
||
|
|
- return nullptr;
|
||
|
|
-
|
||
|
|
obs_module_t *browserModule = obs_get_module("obs-browser");
|
||
|
|
|
||
|
|
if (!browserModule)
|
||
|
|
--
|
||
|
|
2.43.0
|
||
|
|
|