[GExperts-CVS] gexperts/unstable/Src GX_KbdShortCutBroker.pas, 1.32, 1.33

[Erik B. <eb...@us...>]

Update of /cvsroot/gexperts/gexperts/unstable/Src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32216/Src

Modified Files:
	GX_KbdShortCutBroker.pas 
Log Message:
Make sure we mark all pressed GExperts shortcuts as handled, even if we raise an exception
Manually call ApplicationShowException

Index: GX_KbdShortCutBroker.pas
===================================================================
RCS file: /cvsroot/gexperts/gexperts/unstable/Src/GX_KbdShortCutBroker.pas,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- GX_KbdShortCutBroker.pas	9 Jan 2006 02:25:07 -0000	1.32
+++ GX_KbdShortCutBroker.pas	14 Jul 2006 01:32:42 -0000	1.33
@@ -603,7 +603,16 @@
   if Assigned(AShortCutItem) and Assigned(AShortCutItem.Trigger) then
   begin
     BindingResult := krHandled;
-    TriggerKeyboardShortCut(AShortCutItem);
+    try
+      TriggerKeyboardShortCut(AShortCutItem);
+    except
+      on E: Exception do
+      begin
+        // If we don't handle these, the hotkey is passed to the editor (inserts
+        // a character) or another expert (may show another error, dialog, etc.)
+        ApplicationShowException(E);
+      end;
+    end;
   end;
 end;