From 3ed85e581307c90f5733d298d0500911fd57fe6e Mon Sep 17 00:00:00 2001 From: Nathan Fulton Date: Sat, 29 Apr 2017 22:43:01 -0400 Subject: [PATCH] Game::ClearDisplay() null check gaclrFixed gaclrFixed may be null if a game database is not found. Calling GetColor() in this case may result in a crash. --- game/game.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game/game.cpp b/game/game.cpp index 53ace9c..985c6c1 100644 --- a/game/game.cpp +++ b/game/game.cpp @@ -1999,7 +1999,8 @@ void Game::ClearDisplay() DibBitmap *pbmBack = gpdisp->GetBackDib(); if (pbmBack == NULL) return; - pbmBack->Clear(GetColor(kiclrBlack)); + if (gaclrFixed != NULL) + pbmBack->Clear(GetColor(kiclrBlack)); if (gpmfrmm != NULL) { gpmfrmm->InvalidateRect(NULL); gpmfrmm->DrawFrame(false, false);