feat: support multiple webview windows in dart isolates

jnschulze · Apr 26, 2024 · 477c755 · 477c755
1 parent 08eee67
commit 477c755
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/windows/util/rohelper.cc b/windows/util/rohelper.cc
@@ -219,14 +219,25 @@ HRESULT RoHelper::WindowsCompareStringOrdinal(HSTRING one, HSTRING two,
   return mFpWindowsCompareStringOrdinal(one, two, result);
 }
 
+static ABI::Windows::System::IDispatcherQueueController** queueController;
+
 HRESULT RoHelper::CreateDispatcherQueueController(
     DispatcherQueueOptions options,
     ABI::Windows::System::IDispatcherQueueController**
         dispatcherQueueController) {
   if (!mWinRtAvailable) {
     return E_FAIL;
   }
-  return mFpCreateDispatcherQueueController(options, dispatcherQueueController);
+  if (queueController == nullptr || *queueController == nullptr) {
+    auto result = mFpCreateDispatcherQueueController(options, dispatcherQueueController);
+    queueController = dispatcherQueueController;
+    return result;
+  }
+  else
+  {
+    dispatcherQueueController = queueController;
+    return S_OK;
+  }
 }
 
 HRESULT RoHelper::WindowsDeleteString(HSTRING one) {