Fix: Don't crash on null validate callback

This commit is contained in:
Charles Lohr
2005-03-26 22:59:13 +00:00
parent e6f37dbee8
commit 39e9962e41
+7 -4
View File
@@ -324,11 +324,14 @@ void ScreenTextEntry::End( bool bCancelled )
{ {
CString sAnswer = WStringToCString(m_sAnswer); CString sAnswer = WStringToCString(m_sAnswer);
CString sError; CString sError;
bool bValidAnswer = m_pValidate( sAnswer, sError ); if ( m_pValidate != NULL )
if( !bValidAnswer )
{ {
SCREENMAN->Prompt( SM_None, sError ); bool bValidAnswer = m_pValidate( sAnswer, sError );
return; // don't end this screen. if( !bValidAnswer )
{
SCREENMAN->Prompt( SM_None, sError );
return; // don't end this screen.
}
} }
if( m_pOnOK ) if( m_pOnOK )