Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-29 19:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

UWP: Fix possible crash on startup in SizeChanged

Browse source
This commit is contained in:
Connor McLaughlin 2021-10-25 18:42:00 +10:00
parent ccf5006bc8
commit 48ddebd82e
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/duckstation-uwp/uwp_host_interface.cpp
View file

@ -145,8 +145,8 @@ bool UWPHostInterface::CreateDisplay(bool fullscreen)
GAMING_DEVICE_MODEL_INFORMATION gdinfo = {}; GAMING_DEVICE_MODEL_INFORMATION gdinfo = {};
if (SUCCEEDED(GetGamingDeviceModelInformation(&gdinfo)) && gdinfo.vendorId == GAMING_DEVICE_VENDOR_ID_MICROSOFT) if (SUCCEEDED(GetGamingDeviceModelInformation(&gdinfo)) && gdinfo.vendorId == GAMING_DEVICE_VENDOR_ID_MICROSOFT)
{ {
Log_InfoPrintf("Overriding core window size %ux%u with HDMI size %ux%u", wi.surface_width, Log_InfoPrintf("Overriding core window size %ux%u with HDMI size %ux%u", wi.surface_width, wi.surface_height,
wi.surface_height, hdmi_width, hdmi_height); hdmi_width, hdmi_height);
wi.surface_scale *= static_cast<float>(hdmi_width) / static_cast<float>(wi.surface_width); wi.surface_scale *= static_cast<float>(hdmi_width) / static_cast<float>(wi.surface_width);
wi.surface_width = hdmi_width; wi.surface_width = hdmi_width;
wi.surface_height = hdmi_height; wi.surface_height = hdmi_height;
@ -501,13 +501,17 @@ void UWPHostInterface::OnClosed(const IInspectable&, const winrt::Windows::UI::C
void UWPHostInterface::OnSizeChanged(const IInspectable&, void UWPHostInterface::OnSizeChanged(const IInspectable&,
const winrt::Windows::UI::Core::WindowSizeChangedEventArgs& args) const winrt::Windows::UI::Core::WindowSizeChangedEventArgs& args)
{ {
const auto size = args.Size();
const s32 width = static_cast<s32>(size.Width * m_display->GetWindowScale());
const s32 height = static_cast<s32>(size.Height * m_display->GetWindowScale());
if (IsEmulationThreadRunning()) if (IsEmulationThreadRunning())
{ {
const auto size = args.Size();
const float width = size.Width;
const float height = size.Height;
RunLater([this, width, height]() { RunLater([this, width, height]() {
m_display->ResizeRenderWindow(width, height); if (!m_display)
return;
m_display->ResizeRenderWindow(static_cast<s32>(width * m_display->GetWindowScale()),
static_cast<s32>(height * m_display->GetWindowScale()));
OnHostDisplayResized(); OnHostDisplayResized();
}); });
} }