[Scummvm-git-logs] scummvm master -> 114b4d5e5abaded9bd7f5073c8c8465d1d8d8aa2

djsrv dservilla at gmail.com
Fri Jul 30 21:04:30 UTC 2021


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

Summary:
114b4d5e5a GRAPHICS: MACGUI: Fix segfault


Commit: 114b4d5e5abaded9bd7f5073c8c8465d1d8d8aa2
    https://github.com/scummvm/scummvm/commit/114b4d5e5abaded9bd7f5073c8c8465d1d8d8aa2
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-30T17:04:36-04:00

Commit Message:
GRAPHICS: MACGUI: Fix segfault

Changed paths:
    graphics/macgui/macwindowmanager.cpp


diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index ded8b1db09..72efa6143d 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -241,8 +241,10 @@ MacWindowManager::~MacWindowManager() {
 	delete _fontMan;
 	delete _screenCopy;
 
-	_desktopBmp->free();
-	delete _desktopBmp;
+	if (_desktopBmp) {
+		_desktopBmp->free();
+		delete _desktopBmp;
+	}
 	delete _desktop;
 
 	cleanupDataBundle();




More information about the Scummvm-git-logs mailing list