diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index 1629c414d9..18052d78b1 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -49,8 +49,11 @@ int wxImageList::Add( const wxBitmap &bitmap ) }; wxBitmap *wxImageList::GetBitmap(int index) { - wxNode *node = m_images.Nth( index ); - return (wxBitmap*)node->Data(); + wxNode *node = m_images.Nth(index); + if (node != NULL) + return (wxBitmap*)node->Data(); + + return NULL; } bool wxImageList::Replace( int index, const wxBitmap &bitmap )