[Scummvm-git-logs] scummvm master -> adbeacf1ae3ed4b18447cd0e36f3597bb59e1e33

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
adbeacf1ae GRAPHICS: MACGUI: Fix crash in MacText with scrolling


Commit: adbeacf1ae3ed4b18447cd0e36f3597bb59e1e33
    https://github.com/scummvm/scummvm/commit/adbeacf1ae3ed4b18447cd0e36f3597bb59e1e33
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-05-17T10:32:48+02:00

Commit Message:
GRAPHICS: MACGUI: Fix crash in MacText with scrolling

Introduced in a3fd645, and was visible in Total Distortion bookshelf

Changed paths:
    graphics/macgui/macwindowborder.cpp


diff --git a/graphics/macgui/macwindowborder.cpp b/graphics/macgui/macwindowborder.cpp
index a5c99783490..382ad8de53d 100644
--- a/graphics/macgui/macwindowborder.cpp
+++ b/graphics/macgui/macwindowborder.cpp
@@ -258,7 +258,7 @@ void MacWindowBorder::loadBorder(Common::SeekableReadStream &file, uint32 flags,
 		if (i < palette.size())
 			surface->setTransparentColor(i);
 	} else {
-		if (_window->_wm->_pixelformat.isCLUT8())
+		if (!_window || _window->_wm->_pixelformat.isCLUT8())
 			surface->convertToInPlace(Graphics::PixelFormat::createFormatRGBA32());
 		else
 			surface->convertToInPlace(_window->_wm->_pixelformat);