From b7ad652a755fc3b4cfd42de47c71b1d67d8705e9 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Thu, 26 Oct 2023 22:42:46 +0200 Subject: [PATCH] Move empty string test for crop option parsing For consistency with other options. --- server/src/main/java/com/genymobile/scrcpy/Options.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/com/genymobile/scrcpy/Options.java b/server/src/main/java/com/genymobile/scrcpy/Options.java index aab6fce8..49de0567 100644 --- a/server/src/main/java/com/genymobile/scrcpy/Options.java +++ b/server/src/main/java/com/genymobile/scrcpy/Options.java @@ -256,7 +256,9 @@ public class Options { options.tunnelForward = Boolean.parseBoolean(value); break; case "crop": - options.crop = parseCrop(value); + if (!value.isEmpty()) { + options.crop = parseCrop(value); + } break; case "control": options.control = Boolean.parseBoolean(value); @@ -337,9 +339,6 @@ public class Options { } private static Rect parseCrop(String crop) { - if (crop.isEmpty()) { - return null; - } // input format: "width:height:x:y" String[] tokens = crop.split(":"); if (tokens.length != 4) {