Merge pull request #144 from Banaanae/fix-issue-141

Fix #141
mmikeww · Mar 13, 2024 · 2198695 · 2198695
2 parents bfd9951 + 368c021
commit 2198695
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/QuickConvertorV2_scintilla.ahk b/QuickConvertorV2_scintilla.ahk
@@ -360,7 +360,11 @@ CompVscV2E(*)
 }
 Edit_Change(*)
 {
-    GuiCtrlObj := MyGui.FocusedCtrl
+    try {
+        GuiCtrlObj := MyGui.FocusedCtrl
+    } Catch {
+        GuiCtrlObj := ""
+    }
     if IsObject(GuiCtrlObj){
         CurrentCol := EditGetCurrentCol(GuiCtrlObj)
 	    CurrentLine := EditGetCurrentLine(GuiCtrlObj)
@@ -694,7 +698,7 @@ ButtonValidateConversion.OnEvent("Click", ButtonGenerateTest)
 ; Call Gui_Size whenever the window is resized:
 MyGui.OnEvent("Size", Gui_Size)
 
-; MyGui.OnEvent("Close", (*) => ExitApp())
+MyGui.OnEvent("Close", MyExit)
 ; MyGui.OnEvent("Escape", (*) => ExitApp())
 
 FileMenu := Menu()
@@ -1191,6 +1195,7 @@ ViewV2E(*)
 ;*** HOTKEYS ***
 ;***************
 Esc::     ;Exit application - Using either <Esc> Hotkey or Goto("MyExit")
+MyExit(*)
 {
 MyExit:
     ;WRITE BACK VARIABLES SO THAT DEFAULTS ARE SAVED TO INI

diff --git a/lib/scintilla.ahk b/lib/scintilla.ahk
@@ -386,7 +386,7 @@ class Scintilla extends Gui.Custom {
         If (this.AutoSizeNumberMargin)
             this.MarginWidth(0, 33, scn) ; number margin 0, with default style 33
 
-        If (this.CustomSyntaxHighlighting) {
+        If (this.CustomSyntaxHighlighting && WinExist("Quick Convertor V2")) {
 
             data := this.scn_data(scn) ; prep data for DLL calls
             ; wordList := this.makeWordLists()