- fixed crash on closing fatal error window

Framebuffer was accessed after its destruction
ZDoom · Oct 8, 2019 · f678b5d · f678b5d
1 parent d87f759
commit f678b5d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/d_main.cpp b/src/d_main.cpp
@@ -2880,7 +2880,7 @@ void D_Cleanup()
 	M_SaveDefaults(NULL);			// save config before the restart
 
 	// delete all data that cannot be left until reinitialization
-	screen->CleanForRestart();
+	if (screen) screen->CleanForRestart();
 	V_ClearFonts();					// must clear global font pointers
 	ColorSets.Clear();
 	PainFlashes.Clear();

diff --git a/src/rendering/v_video.h b/src/rendering/v_video.h
@@ -663,9 +663,13 @@ class ScaleOverrider
 		savedyfac = CleanYfac;
 		savedwidth = CleanWidth;
 		savedheight = CleanHeight;
-		V_CalcCleanFacs(320, 200, screen->GetWidth(), screen->GetHeight(), &CleanXfac, &CleanYfac);
-		CleanWidth = screen->GetWidth() / CleanXfac;
-		CleanHeight = screen->GetHeight() / CleanYfac;
+
+		if (screen)
+		{
+			V_CalcCleanFacs(320, 200, screen->GetWidth(), screen->GetHeight(), &CleanXfac, &CleanYfac);
+			CleanWidth = screen->GetWidth() / CleanXfac;
+			CleanHeight = screen->GetHeight() / CleanYfac;
+		}
 	}
 
 	~ScaleOverrider()