From db5c4e6a26040bf8f98966a2fee5e2f9ae80b3da Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@keyman.com>
Date: Wed, 4 Dec 2019 11:11:04 +0100
Subject: [PATCH] fix(mac): osk shows unexpectedly Fixes #2346. The OSK would
 show unexpectedly when switching applications because the last active window
 was inconsistently cleared.

---
 mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m
index 89ecff808b..fdc9964e6e 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m
+++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m
@@ -233,6 +233,8 @@ id _lastServerWithOSKShowing = nil;
     if (_kvk != nil && (_alwaysShowOSK || _lastServerWithOSKShowing == newServer)) {
         [self showOSK];
     }
+
+    _lastServerWithOSKShowing = nil;
 }
 
 CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon) {