Skip to content

Display and control your Android device

Push clipboard text only if not null

Romain Vimont93a5c5149d6b
diff --git a/server/src/main/java/com/genymobile/scrcpy/Controller.java b/server/src/main/java/com/genymobile/scrcpy/Controller.java
index 4999f7eb..960c6a6e 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -105,7 +105,9 @@ public class Controller {
break;
case ControlMessage.TYPE_GET_CLIPBOARD:
String clipboardText = device.getClipboardText();
- sender.pushClipboardText(clipboardText);
+ if (clipboardText != null) {
+ sender.pushClipboardText(clipboardText);
+ }
break;
case ControlMessage.TYPE_SET_CLIPBOARD:
boolean paste = (msg.getFlags() & ControlMessage.FLAGS_PASTE) != 0;