From 655fc1b4709282eb61ed3d5d8564ab1fc53cb18e Mon Sep 17 00:00:00 2001 From: John Scipione Date: Tue, 22 Jul 2014 21:15:05 -0400 Subject: [PATCH] Tracker: Check if Submenu() is NULL. CID 601585 --- src/kits/tracker/FilePanelPriv.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/kits/tracker/FilePanelPriv.cpp b/src/kits/tracker/FilePanelPriv.cpp index 98afd8881f..c4479c1cb7 100644 --- a/src/kits/tracker/FilePanelPriv.cpp +++ b/src/kits/tracker/FilePanelPriv.cpp @@ -448,16 +448,26 @@ TFilePanel::SetMessage(BMessage* message) void TFilePanel::SetRefFilter(BRefFilter* filter) { - if (!filter) + if (filter == NULL) return; fPoseView->SetRefFilter(filter); fPoseView->CommitActivePose(); fPoseView->Refresh(); - FavoritesMenu* menu = dynamic_cast - (fMenuBar->FindItem(B_TRANSLATE("Favorites"))->Submenu()); - if (menu) - menu->SetRefFilter(filter); + + if (fMenuBar == NULL) + return; + + BMenuItem* favoritesItem = fMenuBar->FindItem(B_TRANSLATE("Favorites")); + if (favoritesItem == NULL) + return; + + FavoritesMenu* favoritesSubMenu + = dynamic_cast(favoritesItem->Submenu()); + if (favoritesSubMenu == NULL) + return; + + favoritesSubMenu->SetRefFilter(filter); }