Disable daemon on Wayland for now, bump to 0.10.1

Slackadays · Dec 18, 2024 · 7aa51cc · 7aa51cc
1 parent cf596b0
commit 7aa51cc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 
-project(Clipboard LANGUAGES CXX C VERSION 0.10.0)
+project(Clipboard LANGUAGES CXX C VERSION 0.10.1)
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 

diff --git a/app.getclipboard.Clipboard.metainfo.xml b/app.getclipboard.Clipboard.metainfo.xml
@@ -44,6 +44,7 @@
   <url type="contribute">https://github.com/Slackadays/Clipboard/blob/main/.github/CONTRIBUTING.md</url>
 
   <releases>
+    <release version="0.10.1" date="2024-12-18" />
     <release version="0.10.0" date="2024-11-16" />
     <release version="0.9.1" date="2024-10-06" />
     <release version="0.9.0" date="2023-12-17" />

diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: clipboard
-version: "0.10.0"
+version: "0.10.1"
 summary: The ultimate clipboard manager for the terminal
 description: |
   The Clipboard Project is one of the most advanced clipboard managers ever.

diff --git a/src/cb/src/externalclipboards.cpp b/src/cb/src/externalclipboards.cpp
@@ -377,6 +377,11 @@ void setupGUIClipboardDaemon() {
         path.getLock();
         syncWithGUIClipboard(true);
         path.releaseLock();
+
+        if (auto res = getenv("XDG_SESSION_TYPE"); res && !strcmp(res, "wayland")) {
+            exit(EXIT_SUCCESS);
+        } // Skip daemon on Wayland for now
+
         std::this_thread::sleep_for(std::chrono::milliseconds(2000));
         path = Clipboard(std::string(constants.default_clipboard_name));
     }

diff --git a/src/cbwayland/src/wayland.cpp b/src/cbwayland/src/wayland.cpp
@@ -78,7 +78,7 @@ class PasteDaemon {
 
         kill(getppid(), SIGUSR1);
 
-        while (!m_dataSource.isCancelled())
+        //while (!m_dataSource.isCancelled())
             m_display.dispatch();
     }
 };