From 50790ad01db4454ce1e7b6527df75f419dbc4ad9 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Mon, 9 May 2016 16:48:54 +0200
Subject: [PATCH] ZRCola no longer responds to Ctrl+Alt shortcuts when invoked
 with AltGr

---
 ZRCola/zrcolakeyhndlr.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ZRCola/zrcolakeyhndlr.cpp b/ZRCola/zrcolakeyhndlr.cpp
index bba4c54..bef001d 100644
--- a/ZRCola/zrcolakeyhndlr.cpp
+++ b/ZRCola/zrcolakeyhndlr.cpp
@@ -62,7 +62,12 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
                 if (pFrame && pFrame->GetStatusBar())
                     pFrame->SetStatusText(wxEmptyString);
             }
-        } else if (e.GetUnicodeKey() || !e.HasAnyModifiers()) {
+        } else if ((e.GetUnicodeKey() || !e.HasAnyModifiers())
+#if defined(__WXMSW__)
+            && ::GetKeyState(VK_RMENU) >= 0
+#endif
+            )
+        {
             ZRColaApp *app = (ZRColaApp*)wxTheApp;
             ZRCola::keyseq_db::indexKey::size_type start, end;
             bool found;
@@ -132,7 +137,7 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
         }
     } else if (event.GetEventType() == wxEVT_KEY_UP) {
         wxKeyEvent &e = (wxKeyEvent&)event;
-        if (e.GetKeyCode() == WXK_INSERT && m_is_insert) {
+        if (m_is_insert && e.GetKeyCode() == WXK_INSERT) {
             // Insert key has been depressed.
             wxFrame *pFrame = wxDynamicCast(((ZRColaApp*)wxTheApp)->m_mainWnd, wxFrame);
             if (pFrame && pFrame->GetStatusBar())