diff --git a/ChangeLog.md b/ChangeLog.md index a85fb2ab2..c8afab7b4 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -44,6 +44,11 @@ connection timeout specified using the `ConnectTimeout` OpenSSH config file keyword was interpreted as milliseconds rather than seconds. This caused the SSH connection to fail if the timeout was too low. +10. Fixed a regression introduced by 3.1 beta1[3] whereby the value of the +TurboVNC Viewer's `Subsampling` parameter, if specified using the `Samp` alias, +did not override per-host options that were previously saved by the TurboVNC +Viewer Options dialog. + 3.1.3 ===== diff --git a/java/com/turbovnc/rfb/AliasParameter.java b/java/com/turbovnc/rfb/AliasParameter.java index cdce911b8..7547ffa75 100644 --- a/java/com/turbovnc/rfb/AliasParameter.java +++ b/java/com/turbovnc/rfb/AliasParameter.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2012, 2018, 2022-2023 D. R. Commander. All Rights Reserved. +/* Copyright (C) 2012, 2018, 2022-2023, 2025 D. R. Commander. + * All Rights Reserved. * Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved. * * This is free software; you can redistribute it and/or modify @@ -27,7 +28,11 @@ public AliasParameter(String name, Params params, String desc, param = param_; } - public boolean set(String str) { return param.set(str); } + public boolean set(String str) { + boolean retval = param.set(str); + param.setCommandLine(isCommandLine()); + return retval; + } public void reset() { param.reset(); }