KIWAY::Player() wxASSERT

99a19d27 · Dick Hollenbeck · 59d7303b · 99a19d27
Commit 99a19d27 authored Apr 22, 2014 by Dick Hollenbeck
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

kiway.cpp common/kiway.cpp +5 -4

No files found.
--- a/common/kiway.cpp
+++ b/common/kiway.cpp
@@ -241,16 +241,17 @@ KIWAY_PLAYER* KIWAY::Player( FRAME_T aFrameType, bool doCreate )
    if( doCreate )
    {
        FACE_T face_type = KifaceType( aFrameType );
-
        wxASSERT( face_type != FACE_T(-1) );

        KIFACE* kiface = KiFACE( face_type );
-
        wxASSERT( kiface );

-        KIWAY_PLAYER* frame = (KIWAY_PLAYER*) kiface->CreateWindow( m_top, aFrameType, this, KFCTL_PROJECT_SUITE );
+        if( kiface )
+        {
+            KIWAY_PLAYER* frame = (KIWAY_PLAYER*) kiface->CreateWindow( m_top, aFrameType, this, KFCTL_PROJECT_SUITE );

-        return m_player[aFrameType] = frame;
+            return m_player[aFrameType] = frame;
+        }
    }

    return NULL;