From 5b454cd8cd02f47e069cd7ee1bb992f2a0a11bc4 Mon Sep 17 00:00:00 2001 From: crschnick Date: Thu, 13 Mar 2025 12:55:25 +0000 Subject: [PATCH] Fix NPE for FreeRDP --- .../java/io/xpipe/app/prefs/ExternalRdpClientType.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java b/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java index 447ad6975..ece960090 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java +++ b/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java @@ -125,8 +125,12 @@ public interface ExternalRdpClientType extends PrefsChoiceValue { @Override public void launch(LaunchConfiguration configuration) throws Exception { var file = writeRdpConfigFile(configuration.getTitle(), configuration.getConfig()); - var escapedPw = configuration.getPassword().getSecretValue().replaceAll("'", "\\\\'"); - launch(configuration.getTitle(), CommandBuilder.of().addFile(file.toString()).add("/cert-ignore").add("/p:'" + escapedPw + "'")); + var b = CommandBuilder.of().addFile(file.toString()).add("/cert-ignore"); + if (configuration.getPassword() != null) { + var escapedPw = configuration.getPassword().getSecretValue().replaceAll("'", "\\\\'"); + b.add("/p:'" + escapedPw + "'"); + } + launch(configuration.getTitle(), b); } @Override