mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-10 12:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add extra checks in Manager::_closeWindow() to avoid crashes

Browse Source 
Possible fix for #3362
This commit is contained in:
David Capello 2022-06-08 13:10:26 -03:00
parent dc9a6aa685
commit fa6325d237
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ui/manager.cpp
View File

@ -1504,14 +1504,23 @@ void Manager::_closeWindow(Window* window, bool redraw_background)
ASSERT(windowDisplay); ASSERT(windowDisplay);
ASSERT(windowDisplay != this->display()); ASSERT(windowDisplay != this->display());
// We are receiving several crashes from Windows users where
// parentDisplay != nullptr and parentDisplay->nativeWindow() ==
// nullptr, so we have to do some extra checks in these places
// (anyway this might produce some crashes in other places)
os::Window* nativeWindow = (windowDisplay ? windowDisplay->nativeWindow(): nullptr);
os::Window* parentNativeWindow = (parentDisplay ? parentDisplay->nativeWindow(): nullptr);
ASSERT(nativeWindow);
ASSERT(parentNativeWindow);
// Just as we've set the origin of the window bounds to (0, 0) // Just as we've set the origin of the window bounds to (0, 0)
// when we created the native window, we have to restore the // when we created the native window, we have to restore the
// ui::Window bounds' origin now that we are going to remove/close // ui::Window bounds' origin now that we are going to remove/close
// the native window. // the native window.
if (parentDisplay && windowDisplay) { if (parentNativeWindow && nativeWindow) {
const int scale = parentDisplay->nativeWindow()->scale(); const int scale = parentNativeWindow->scale();
const gfx::Point parentOrigin = parentDisplay->nativeWindow()->contentRect().origin(); const gfx::Point parentOrigin = parentNativeWindow->contentRect().origin();
const gfx::Point origin = windowDisplay->nativeWindow()->contentRect().origin(); const gfx::Point origin = nativeWindow->contentRect().origin();
const gfx::Rect newBounds((origin - parentOrigin) / scale, const gfx::Rect newBounds((origin - parentOrigin) / scale,
window->bounds().size()); window->bounds().size());
window->setBounds(newBounds); window->setBounds(newBounds);
@ -1520,7 +1529,8 @@ void Manager::_closeWindow(Window* window, bool redraw_background)
// Set the native window user data to nullptr so any other queued // Set the native window user data to nullptr so any other queued
// native message is not processed. // native message is not processed.
window->setDisplay(nullptr, false); window->setDisplay(nullptr, false);
windowDisplay->nativeWindow()->setUserData<void*>(nullptr); if (nativeWindow)
nativeWindow->setUserData<void*>(nullptr);
// Remove all messages for this display. // Remove all messages for this display.
removeMessagesForDisplay(windowDisplay); removeMessagesForDisplay(windowDisplay);
@ -1533,7 +1543,8 @@ void Manager::_closeWindow(Window* window, bool redraw_background)
delete windowDisplay; delete windowDisplay;
// Activate main windows // Activate main windows
parentDisplay->nativeWindow()->activate(); if (parentNativeWindow)
parentNativeWindow->activate();
} }
else { else {
parentDisplay = windowDisplay; parentDisplay = windowDisplay;