From fdd725fc687a9206ab7281cd707ce4907081e78b Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Thu, 13 Aug 2015 23:24:58 -0500
Subject: [PATCH] Fit double execution of meta commands

---
 src/commands/CommandManager.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp
index 059bba708..2b35d86c0 100644
--- a/src/commands/CommandManager.cpp
+++ b/src/commands/CommandManager.cpp
@@ -198,9 +198,9 @@ public:
       }
 
       wxWindow *handler = project->GetKeyboardCaptureHandler();
-      if (handler && HandleCapture(handler, key))
+      if (handler)
       {
-         return Event_Processed;
+         return HandleCapture(handler, key) ? Event_Processed : Event_Skip;
       }
 
       CommandManager *manager = project->GetCommandManager();
@@ -1065,8 +1065,10 @@ bool CommandManager::FilterKeyEvent(AudacityProject *project, const wxKeyEvent &
       return false;
    }
 
+   int type = evt.GetEventType();
+
    // Global commands aren't tied to any specific project
-   if (entry->isGlobal)
+   if (entry->isGlobal && type == wxEVT_KEY_DOWN)
    {
       // Global commands are always disabled so they do not interfere with the
       // rest of the command handling.  But, to use the common handler, we
@@ -1075,10 +1077,7 @@ bool CommandManager::FilterKeyEvent(AudacityProject *project, const wxKeyEvent &
       entry->enabled = true;
       bool ret = HandleCommandEntry(entry, 0xffffffff, 0xffffffff, &evt);
       entry->enabled = false;
-      if (ret)
-      {
-         return true;
-      }
+      return ret;
    }
 
    // Any other keypresses must be destined for this project window.
@@ -1091,7 +1090,7 @@ bool CommandManager::FilterKeyEvent(AudacityProject *project, const wxKeyEvent &
 
    wxKeyEvent temp = evt;
 
-   if (temp.GetEventType() == wxEVT_KEY_DOWN)
+   if (type == wxEVT_KEY_DOWN)
    {
       if (entry->skipKeydown)
       {
@@ -1101,7 +1100,7 @@ bool CommandManager::FilterKeyEvent(AudacityProject *project, const wxKeyEvent &
       return HandleCommandEntry(entry, flags, 0xffffffff, &temp);
    }
 
-   if (temp.GetEventType() == wxEVT_KEY_UP && entry->wantKeyup)
+   if (type == wxEVT_KEY_UP && entry->wantKeyup)
    {
       return HandleCommandEntry(entry, flags, 0xffffffff, &temp);
    }