Merge pull request gmamaladze#75 from brusdev/patch-mouseupext

Fix MouseUpExt event after MouseDownExt handled
pudwinkie · Feb 24, 2017 · f41e98b · f41e98b
2 parents 8517f91 + 30616c8
commit f41e98b
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/MouseKeyHook/Implementation/MouseListener.cs b/MouseKeyHook/Implementation/MouseListener.cs
@@ -119,23 +119,22 @@ protected virtual void ProcessDown(ref MouseEventExtArgs e)
 
         protected virtual void ProcessUp(ref MouseEventExtArgs e)
         {
+            OnUp(e);
+            OnUpExt(e);
+            if (e.Handled)
+            {
+                return;
+            }
+
             if (m_SingleDown.Contains(e.Button))
             {
-                OnUp(e);
-                OnUpExt(e);
-                if (e.Handled)
-                {
-                    return;
-                }
                 OnClick(e);
                 m_SingleDown.Remove(e.Button);
             }
 
             if (m_DoubleDown.Contains(e.Button))
             {
                 e = e.ToDoubleClickEventArgs();
-                OnUp(e);
-                OnUpExt(e);
                 OnDoubleClick(e);
                 m_DoubleDown.Remove(e.Button);
             }