Fix crashing in Windows Insiders builds (#2562)

Added missing initialization of winrt apartment
This commit is contained in:
Tomas Agustin Raies
2020-05-04 11:36:57 -07:00
committed by GitHub
parent 6cd0f83496
commit 0f6563e8e0
2 changed files with 8 additions and 1 deletions

View File

@@ -227,6 +227,8 @@ void XamlBridge::OnTakeFocusRequested(winrt::Windows::UI::Xaml::Hosting::Desktop
HWND XamlBridge::InitDesktopWindowsXamlSource(winrt::Windows::UI::Xaml::Hosting::DesktopWindowXamlSource desktopSource)
{
HRESULT hr = S_OK;
winrt::init_apartment(apartment_type::single_threaded);
winxamlmanager = WindowsXamlManager::InitializeForCurrentThread();
auto interop = desktopSource.as<IDesktopWindowXamlSourceNative>();
// Parent the DesktopWindowXamlSource object to current window
@@ -258,6 +260,8 @@ void XamlBridge::ClearXamlIslands()
xamlSource.Close();
}
m_xamlSources.clear();
winxamlmanager.Close();
}
// Function invoked when the window is destroyed