From dbc0e87c8058b77d79c20a1c24e5c6d9fe8cacea Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 Jun 2022 18:08:42 +0400
Subject: [PATCH] Fix possible crash in native event filter.

---
 ui/platform/win/ui_window_win.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 1f02692..1ad1454 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -342,11 +342,15 @@ bool WindowHelper::nativeEvent(
 	const auto guard = gsl::finally([&] {
 		*result = base::NativeEventResult(lresult);
 	});
-	return handleNativeEvent(
-		msg->message,
-		msg->wParam,
-		msg->lParam,
-		&lresult);
+	auto filtered = false;
+	base::Integration::Instance().enterFromEventLoop([&] {
+		filtered = handleNativeEvent(
+			msg->message,
+			msg->wParam,
+			msg->lParam,
+			&lresult);
+	});
+	return filtered;
 }
 
 bool WindowHelper::handleNativeEvent(