Merge branch 'main' into Bridged-ModeSupport

MatejGolian · Oct 26, 2024 · d0bded0 · d0bded0
2 parents 2e6d515 + 9b131eb
commit d0bded0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Added support for bridged mode in Reaper
 -   Changed message spoken on reload
 -   Make it easier to add/manage configuration settings
+-   Remove 'win covered' warning' in standalone applications
 -   Retrieve release and version information from GitHub API
 -   Use 'REAPER-alike' update dialogs
 -   HotspotHelper: Add function for retrieving window position and dimensions

diff --git a/Includes/Overlays/Sforzando.ahk b/Includes/Overlays/Sforzando.ahk
@@ -12,18 +12,18 @@ Class Sforzando {
         PluginInstance := Plugin.GetInstance(GetCurrentControlClass())
         If PluginInstance Is Plugin And PluginInstance.Name = "sforzando"
         Return True
-        Try {
-            UIAElement := GetUIAElement(1)
-            If not UIAElement = False And UIAElement.Name = "PlogueXMLGUI"
-            Return True
-            UIAElement := GetUIAElement(2)
-            If not UIAElement = False And UIAElement.Name = "PlogueXMLGUI"
-            Return True
-            UIAElement := GetUIAElement("15,1")
-            If not UIAElement = False And UIAElement.Name = "PlogueXMLGUI"
-            Return True
-        }
-        Sleep 500
+        UIAElement := GetUIAElement(1)
+        Try
+        If not UIAElement = False And UIAElement.Name = "PlogueXMLGUI"
+        Return True
+        UIAElement := GetUIAElement(2)
+        Try
+        If not UIAElement = False And UIAElement.Name = "PlogueXMLGUI"
+        Return True
+        UIAElement := GetUIAElement("15,1")
+        Try
+        If not UIAElement = False And UIAElement.Name = "PlogueXMLGUI"
+        Return True
         Return False
     }
 

diff --git a/Lib/Config.ahk b/Lib/Config.ahk
@@ -7,7 +7,7 @@ Static Settings := Array()
 Static __New() {
 This.Add("ReaHotkey.ini", "Config", "CheckScreenResolutionOnStartup", 1, "Check screen resolution on startup")
 This.Add("ReaHotkey.ini", "Config", "CheckForUpdatesOnStartup", 1, "Check for updates on startup")
-This.Add("ReaHotkey.ini", "Config", "WarnIfWinCovered", 1, "Warn if another window may be covering the interface")
+This.Add("ReaHotkey.ini", "Config", "WarnIfWinCovered", 1, "Warn if another window may be covering the interface in specific cases")
 This.Add("ReaHotkey.ini", "Config", "UseImageSearchForEngine2PluginDetection", 1, "Use image search for Engine 2 plug-in detection")
 This.Add("ReaHotkey.ini", "Config", "AutomaticallyCloseLibrariBrowsersInKontaktAndKKPlugins", 1, "Automatically close library browsers in Kontakt and Komplete Kontrol plug-ins")
 This.Add("ReaHotkey.ini", "Config", "AutomaticallyCloseLibrariBrowsersInKontaktAndKKStandalones", 1, "Automatically close library browsers in Kontakt and Komplete Kontrol standalone applications")

diff --git a/Lib/ReaHotkey.ahk b/Lib/ReaHotkey.ahk
@@ -477,21 +477,11 @@ Class ReaHotkey {
             Thread "NoTimers"
             Try
             If WinActive(ReaHotkey.PluginWinCriteria) And ReaHotkey.FoundPlugin Is Plugin {
-                If WinExist("Error opening devices ahk_exe reaper.exe")
-                ReportError()
-            }
-            Else If Not ReaHotkey.StandaloneWinCriteria = False And WinActive(ReaHotkey.StandaloneWinCriteria) And ReaHotkey.FoundStandalone Is standalone {
-                CurrentWinID := WinGetID("A")
-                AllWinIDs := WinGetList(,, "Program Manager")
-                For WinNumber, WinID In AllWinIDs
-                If WinID = CurrentWinID And WinNumber > 2 And Not WinExist("ahk_class #32768") {
+                If WinExist("Error opening devices ahk_exe reaper.exe") {
                     ReportError()
-                    Break
+                    Return
                 }
             }
-            Else {
-                Return
-            }
             ReportError() {
                 AccessibilityOverlay.Speak("Warning: Another window may be covering the interface. ReaHotkey may not work correctly.")
             }