Use return instead of exit in functions

Fixed: `ffcast -ww each` would print only the 1st selection.
ropery · Oct 3, 2016 · 3c7d743 · 3c7d743
1 parent 9f94de5
commit 3c7d743
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/ffcast.bash b/src/ffcast.bash
@@ -332,7 +332,7 @@ run_subcmd_or_command() {
     local sub_cmd=$1
     if [[ -z $sub_cmd ]]; then
         run_default_command
-        exit
+        return
     fi
     if [[ -v sub_commands[$sub_cmd] ]]; then
         shift
@@ -342,10 +342,10 @@ run_subcmd_or_command() {
         else
             error "sub-command '%s' function '%s' not found" "$sub_cmd" \
                 "$sub_cmd_func"
-            exit 1
+            return 1
         fi
     else
-        run_external_command "$@" || exit
+        run_external_command "$@"
     fi
 }
 

diff --git a/src/subcmd.bash b/src/subcmd.bash
@@ -96,7 +96,7 @@ subcmd_pad() {
     let 'rect_x -= l' 'rect_y -= t' 'rect_X -= r' 'rect_Y -= b' || :
     verbose 'padding: top=%d right=%d bottom=%d left=%d' "$t" "$r" "$b" "$l"
     offsets="$rect_x $rect_y $rect_X $rect_Y"
-    set_region_vars_by_offsets || exit
+    set_region_vars_by_offsets || return
     run_subcmd_or_command "$@"
 }