From afd0346d664bb281c91ec9f4a60ac73f94b8700a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 2 Nov 2022 00:19:43 +0100 Subject: [PATCH] Fix #18481: prevent misuse of moved-from object in WindowTooltipShow (#18483) --- src/openrct2-ui/windows/Tooltip.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/openrct2-ui/windows/Tooltip.cpp b/src/openrct2-ui/windows/Tooltip.cpp index eb75a3b4ce..ef91d76523 100644 --- a/src/openrct2-ui/windows/Tooltip.cpp +++ b/src/openrct2-ui/windows/Tooltip.cpp @@ -139,9 +139,10 @@ void WindowTooltipShow(const OpenRCT2String& message, ScreenCoordsXY screenCoord return; auto tooltipWindow = std::make_unique(message, screenCoords); - WindowCreate( - std::move(tooltipWindow), WindowClass::Tooltip, tooltipWindow->windowPos, tooltipWindow->width, tooltipWindow->height, - WF_TRANSPARENT | WF_STICK_TO_FRONT); + auto windowPos = tooltipWindow->windowPos; + auto width = tooltipWindow->width; + auto height = tooltipWindow->height; + WindowCreate(std::move(tooltipWindow), WindowClass::Tooltip, windowPos, width, height, WF_TRANSPARENT | WF_STICK_TO_FRONT); } void WindowTooltipOpen(rct_window* widgetWindow, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)