clipboard: change warning message to be less misleading

[waydroid.git] / tools / services / clipboard_manager.py

diff --git a/tools/services/clipboard_manager.py b/tools/services/clipboard_manager.py
index 72fe62afc68795036fd1168e2801eff083dcd168..b7007d0eb1a18158f005cdd624a22d2e83d9c6a2 100644 (file)
--- a/tools/services/clipboard_manager.py
+++ b/tools/services/clipboard_manager.py
@@ -11,6 +11,8 @@ except Exception as e:
     logging.debug(str(e))
     canClip = False
 
+stopping = False
+
 def start(args):
     def sendClipboardData(value):
         try:
@@ -23,17 +25,23 @@ def start(args):
             return pyclip.paste()
         except Exception as e:
             logging.debug(str(e))
+        return ""
 
     def service_thread():
-        IClipboard.add_service(args, sendClipboardData, getClipboardData)
+        while not stopping:
+            IClipboard.add_service(args, sendClipboardData, getClipboardData)
 
     if canClip:
+        global stopping
+        stopping = False
         args.clipboard_manager = threading.Thread(target=service_thread)
         args.clipboard_manager.start()
     else:
-        logging.warning("Failed to start Clipboard manager service, check logs")
+        logging.warning("Skipping clipboard manager service because of missing pyclip package")
 
 def stop(args):
+    global stopping
+    stopping = True
     try:
         if args.clipboardLoop:
             args.clipboardLoop.quit()