From 9c17ca3fe67a5c166b39db2d0e11925002ffc6cb Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 9 Dec 2011 15:23:37 +0000 Subject: [PATCH] avoid accepting an invalid color, ignore it, as other ports do, fixes #13720 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/dcgraph.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp index 1f08538f85..9dc59efb53 100644 --- a/src/common/dcgraph.cpp +++ b/src/common/dcgraph.cpp @@ -382,7 +382,10 @@ void wxGCDCImpl::SetTextForeground( const wxColour &col ) { wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::SetTextForeground - invalid DC") ); - if ( col != m_textForegroundColour ) + // don't set m_textForegroundColour to an invalid colour as we'd crash + // later then (we use m_textForegroundColour.GetColor() without checking + // in a few places) + if ( col.IsOk() && col != m_textForegroundColour ) { m_textForegroundColour = col; m_graphicContext->SetFont( m_font, m_textForegroundColour ); -- 2.45.2