summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md1
-rw-r--r--mullvad-cli/src/cmds/relay.rs1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b03e59a035..29c4985508 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@ Line wrap the file at 100 chars. Th
### Fixed
- Check and adjust relay and bridge constraints when they are updated, so no incompatible
combinations are used.
+- Fix panic when running CLI "mullvad relay set custom" without any more arguments.
## [2019.7-beta1] - 2019-08-08
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index efa319ef4a..a86270bcf0 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -35,6 +35,7 @@ impl Command for Relay {
.subcommand(
clap::SubCommand::with_name("custom")
.about("Set a custom VPN relay")
+ .setting(clap::AppSettings::SubcommandRequiredElseHelp)
.subcommand(clap::SubCommand::with_name("wireguard")
.arg(
clap::Arg::with_name("host")