From 525aa91cbf702e4ad632eae12210ac541d8132d6 Mon Sep 17 00:00:00 2001
From: Ben Reaves <rbreaves@gmail.com>
Date: Wed, 11 Nov 2020 19:54:56 -0600
Subject: [PATCH 1/2] - Updated Windows icons, modifiers release fix

---
 windows/kinto.ahk | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/windows/kinto.ahk b/windows/kinto.ahk
index 0e49fc1..0e0d7ba 100644
--- a/windows/kinto.ahk
+++ b/windows/kinto.ahk
@@ -24,7 +24,7 @@ AHK_NOTIFYICON(wParam, lParam)
 }
 ; End Enable Left clicks
 
-; I_Icon = %A_ScriptDir%\assets\kinto-white.ico           ; MacModifiers
+; I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico    ; MacModifiers
 ; IfExist, %I_Icon%                                       ; MacModifiers
 ; Menu, Tray, Icon, %I_Icon%,, 1                          ; MacModifiers
 ; Menu, Tray, Tip, Mac - Kinto                            ; MacModifiers
@@ -97,8 +97,9 @@ Send {LAlt down}{tab}{LAlt up}
 tray_suspend(){
     suspend toggle
     if (a_isSuspended = 1){
+        Gosub ReleaseModifiers
         menu, tray, check  , Suspend Kinto
-        I_Icon = %A_ScriptDir%\assets\kinto-color-invert.ico
+        I_Icon = %A_ScriptDir%\assets\kinto-white.ico
         Menu, Tray, Icon, %I_Icon%,, 1
         Menu, Tray, Tip, Suspended - Kinto
         IfWinExist, detectUSB.ahk
@@ -106,7 +107,7 @@ tray_suspend(){
     }
     else{
         menu, tray, unCheck, Suspend Kinto
-;         I_Icon = %A_ScriptDir%\assets\kinto-white.ico           ; MacModifiers
+;         I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico    ; MacModifiers
 ;         I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico    ; WinModifiers/CB/IBM
         Menu, Tray, Icon, %I_Icon%,,1
         Run, %A_ScriptDir%\detectUSB.ahk
@@ -116,6 +117,7 @@ tray_suspend(){
 }
 
 Exit() {
+    Gosub ReleaseModifiers
     IfWinExist, detectUSB.ahk
         WinClose
 
@@ -619,4 +621,15 @@ GroupAdd, intellij, ahk_exe idea64.exe
         !y::Send {LCtrl down}y{LCtrl Up} ; CB/IBM
         !v::Send {LCtrl down}v{LCtrl Up} ; CB/IBM
     #If
-#If
\ No newline at end of file
+#If
+
+ReleaseModifiers:
+Send {RCtrl up}
+Send {LCtrl up}
+Send {RAlt up}
+Send {LAlt up}
+Send {RWin up}
+Send {LWin up}
+Send {RShift up}
+Send {LShift up}
+return
\ No newline at end of file

From ef6dc65a20751994ee014503eab5f5553bdc0e38 Mon Sep 17 00:00:00 2001
From: Ben Reaves <rbreaves@gmail.com>
Date: Wed, 11 Nov 2020 20:18:30 -0600
Subject: [PATCH 2/2] - Added check for xkeysnail installing properly

---
 xkeysnail_service.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh
index 7a077fe..633d5bd 100755
--- a/xkeysnail_service.sh
+++ b/xkeysnail_service.sh
@@ -476,6 +476,13 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	fi
 	sudo pip3 install --upgrade .
 	cd ..
+	which xkeysnail
+	if [ $? -eq 1 ]; then
+		echo -e "\nKinto install has \e[1m\033[0;91mfailed\e[0m.\n"
+		echo -e "cd into ./xkeysnail"
+		echo -e "Run 'sudo pip3 install --upgrade .' to debug issue"
+		exit 0
+	fi
 	sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./xkeysnail-config/xkeysnail.service.new
 	sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./xkeysnail-config/limitedadmins.new
 	sudo mv ./xkeysnail-config/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"