diff --git a/CMakeLists.txt b/CMakeLists.txt index 497d422b8..4986d24f8 100644 --- 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 index b4c8e7d13..734c7eb66 100644 --- a/app.getclipboard.Clipboard.metainfo.xml +++ b/app.getclipboard.Clipboard.metainfo.xml @@ -44,6 +44,7 @@ https://github.com/Slackadays/Clipboard/blob/main/.github/CONTRIBUTING.md + diff --git a/snapcraft.yaml b/snapcraft.yaml index 400b9ecdb..a2a94cc5a 100644 --- 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 index 2d04b166b..3242957fe 100644 --- 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 index 3adf08a92..5188d7582 100644 --- 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(); } };