- fix optional param for hotkeys

cesare-montresor · Feb 11, 2024 · 878c77a · 878c77a
1 parent 946762c
commit 878c77a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Razor/Network/EventManager.cs b/Razor/Network/EventManager.cs
@@ -84,6 +84,7 @@ public class EventManager
     {
         static readonly public EventManager Instance = new EventManager();
 
+
         public delegate void OnPacketCallback(string path, byte[] data);
         public delegate void OnJournalCallback(Journal.JournalEntry entry);
         public delegate void OnHotkeyCallback(string hotkey);
@@ -95,6 +96,7 @@ public class EventManager
         private readonly ConcurrentDictionary<Thread, ConcurrentDictionary<string, HashSet<OnJournalCallback>>> m_JournalCallbacks = new ConcurrentDictionary<Thread, ConcurrentDictionary<string, HashSet<OnJournalCallback>>>();
         private readonly ConcurrentDictionary<Thread, ConcurrentDictionary<string, HashSet<OnHotkeyCallback>>> m_HotkeyCallbacks = new ConcurrentDictionary<Thread, ConcurrentDictionary<string, HashSet<OnHotkeyCallback>>>();
 
+
         // Auto-cleanup based on thead state/activity, can and should be improved.
         public void Cleanup()
         {
@@ -200,7 +202,7 @@ public void didRecieveHotkey(Keys hotkey)
         {
             var notify = new Task(() =>
             {
-                var textHotkey = hotkey.ToString();
+                var textHotkey = hotkey.ToString() ;
                 Cleanup();
                 foreach (var pairs in m_HotkeyCallbacks)
                 {

diff --git a/Razor/Properties/AssemblyInfo.cs b/Razor/Properties/AssemblyInfo.cs
@@ -26,7 +26,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.8.2.117")]
+[assembly: AssemblyVersion("0.8.2.118")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the

diff --git a/Razor/RazorEnhanced/Events.cs b/Razor/RazorEnhanced/Events.cs
@@ -6,6 +6,8 @@ namespace RazorEnhanced
 {
     public class Events
     {
+
+
         /*
         - DONE:
         Events.OnPacket(packetid, callback)
@@ -82,10 +84,10 @@ public static void OnJournal(IronPython.Runtime.PythonFunction callback, string
         /// Register a Python function to be called when a hotkey get pressed
         /// </summary>
         /// <param name="callback">Python function to be called.</param>
-        /// <param name="hotkey">Name of the Hotkey</param>
-
-        public static void OnHotkey(IronPython.Runtime.PythonFunction callback, string hotkey)
+        /// <param name="hotkey">(Optional) Name of the Hotkey (null or "": Match all)</param>
+        public static void OnHotkey(IronPython.Runtime.PythonFunction callback, string hotkey=null)
         {
+            if (hotkey == null) { hotkey = ""; }
             var script = EnhancedScriptService.Instance.CurrentScript();
             EventManager.Instance.OnHotkey(hotkey, (hotkeyMatch) =>
             {