From 031bb9de219e5e5769c83dcdad53d5974ec4f793 Mon Sep 17 00:00:00 2001
From: Maarten van Gompel <proycon@anaproy.nl>
Date: Wed, 2 Dec 2020 00:42:42 +0100
Subject: [PATCH] no need for number validation when cancelling dialer

---
 scripts/modem/sxmo_modemdial.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/modem/sxmo_modemdial.sh b/scripts/modem/sxmo_modemdial.sh
index f80ad3e..57a289c 100755
--- a/scripts/modem/sxmo_modemdial.sh
+++ b/scripts/modem/sxmo_modemdial.sh
@@ -30,7 +30,12 @@ dialmenu() {
 		sxmo_dmenu_with_kb.sh -l 10 -p Number -c -fn Terminus-20 -i
 	)"
 	NUMBER="$(echo "$NUMBER" | cut -d: -f1 | tr -d -- '- ')"
-	echo "$NUMBER" | grep -qE '^[+0-9]+$' || fatalerr "$NUMBER is not a number"
+	if [ -z "$NUMBER" ] || [ "$NUMBER" = "CloseMenu" ]; then
+		#no number selected (probably cancelled), silently discard
+		exit 0
+	else
+		echo "$NUMBER" | grep -qE '^[+0-9]+$' || fatalerr "$NUMBER is not a number"
+	fi
 
 	echo "Attempting to dial: $NUMBER" >&2
 	CALLID="$(
@@ -44,4 +49,6 @@ dialmenu() {
 
 modem_n || fatalerr "Couldn't determine modem number - is modem online?"
 CREATEDCALLID="$(dialmenu)"
-sxmo_modemcall.sh pickup "$CREATEDCALLID"
+if [ ! -z "$CREATEDCALLID" ]; then
+	sxmo_modemcall.sh pickup "$CREATEDCALLID"
+fi