From cf8a7df70b70123cd0b5bf917e7a3a51155932eb Mon Sep 17 00:00:00 2001
From: Simon Let <simon.let@showmax.com>
Date: Tue, 30 Jun 2020 15:44:49 +0200
Subject: [PATCH] Only turn on keybindings once per session

---
 scripts/shellrc.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/shellrc.sh b/scripts/shellrc.sh
index 7b55f9b..fa9728a 100644
--- a/scripts/shellrc.sh
+++ b/scripts/shellrc.sh
@@ -79,14 +79,6 @@ if [ -z "${__RESH_SESSION_ID+x}" ]; then
     # TODO add sesson time
     __resh_reset_variables
     __resh_session_init
-fi
-
-# block for anything we only want to do once per shell
-if [ -z "${__RESH_INIT_DONE+x}" ]; then
-    preexec_functions+=(__resh_preexec)
-    precmd_functions+=(__resh_precmd)
-
-    __resh_reset_variables
 
     if [ "$__RESH_SHELL" = bash ] ; then
         [ "$(resh-config --key BindArrowKeysBash)" = true ] && __resh_bind_arrows
@@ -97,6 +89,14 @@ if [ -z "${__RESH_INIT_DONE+x}" ]; then
         echo "$__RESH_SHELL"
     fi
     [ "$(resh-config --key BindControlR)" = true ] && __resh_bind_control_R
+fi
+
+# block for anything we only want to do once per shell
+if [ -z "${__RESH_INIT_DONE+x}" ]; then
+    preexec_functions+=(__resh_preexec)
+    precmd_functions+=(__resh_precmd)
+
+    __resh_reset_variables
 
     __RESH_INIT_DONE=1
 fi