diff --git a/src/kits/tracker/Navigator.cpp b/src/kits/tracker/Navigator.cpp index ddde01569a..9d5bdd69c7 100644 --- a/src/kits/tracker/Navigator.cpp +++ b/src/kits/tracker/Navigator.cpp @@ -344,8 +344,12 @@ BNavigator::SendNavigationMessage(NavigationAction action, BEntry* entry, // Todo: Change the locking behaviour of // StandAloneTaskLoop::Run() and subsequently called // functions. - if (nodeRef) - dynamic_cast(be_app)->SelectChildInParentSoon(&ref, nodeRef); + if (nodeRef != NULL) { + TTracker* tracker = dynamic_cast(be_app); + if (tracker != NULL) + tracker->SelectChildInParentSoon(&ref, nodeRef); + } + LockLooper(); } }