main: hotfix d35682a

akinomyoga · Jul 15, 2019 · c2a268a · c2a268a
1 parent dc1721f
commit c2a268a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ble.pp b/ble.pp
@@ -719,7 +719,9 @@ function ble/base/process-blesh-arguments {
   (attach) ble-attach ;;
   (prompt) _ble_base_attach_PROMPT_COMMAND=$PROMPT_COMMAND
            _ble_base_attach_from_prompt=1
-           PROMPT_COMMAND=ble/base/attach-from-PROMPT_COMMAND ;;
+           PROMPT_COMMAND=ble/base/attach-from-PROMPT_COMMAND
+           [[ $_ble_edit_detach_flag == reload ]] &&
+             _ble_edit_detach_flag= ;;
   esac
   [[ ! $opt_error ]]
 }

diff --git a/src/edit.sh b/src/edit.sh
@@ -7082,7 +7082,7 @@ function ble-edit/bind/.exit-TRAPRTMAX {
 ##
 function ble-edit/bind/.check-detach {
   # Note: #D1130 reload の為に detach して attach しなかった場合
-  if [[ $_ble_edit_detach_flag == reload ]]; then
+  if [[ ! $_ble_attached && $_ble_edit_detach_flag == reload ]]; then
     ble-detach/message \
       "${_ble_term_setaf[12]}[ble: detached]$_ble_term_sgr0" \
       "Please run \`stty sane' to recover the correct TTY state."