diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp index 0626900909..35023981b0 100644 --- a/src/kits/tracker/ContainerWindow.cpp +++ b/src/kits/tracker/ContainerWindow.cpp @@ -2906,6 +2906,9 @@ BContainerWindow::AddWindowContextMenus(BMenu* menu) // since we check view mode before display, this should be a radio // mode menu + Model* targetModel = TargetModel(); + ASSERT(targetModel != NULL); + bool needSeparator = true; if (IsTrash()) { menu->AddItem(new BMenuItem(B_TRANSLATE("Empty Trash"), @@ -2913,7 +2916,7 @@ BContainerWindow::AddWindowContextMenus(BMenu* menu) } else if (IsPrintersDir()) { menu->AddItem(new BMenuItem(B_TRANSLATE("Add printer" B_UTF8_ELLIPSIS), new BMessage(kAddPrinter), 'N')); - } else if (InTrash() || TargetModel()->IsRoot()) { + } else if (InTrash() || targetModel->IsRoot()) { needSeparator = false; } else { TemplatesMenu* templatesMenu = new TemplatesMenu(PoseView(), @@ -2945,7 +2948,7 @@ BContainerWindow::AddWindowContextMenus(BMenu* menu) new BMessage(kOpenParentDir), B_UP_ARROW)); } - if (TargetModel()->IsRoot()) { + if (targetModel->IsRoot()) { menu->AddSeparatorItem(); menu->AddItem(new MountMenu(B_TRANSLATE("Mount"))); } diff --git a/src/kits/tracker/OpenWithWindow.cpp b/src/kits/tracker/OpenWithWindow.cpp index 1ce74a3635..615a6e926b 100644 --- a/src/kits/tracker/OpenWithWindow.cpp +++ b/src/kits/tracker/OpenWithWindow.cpp @@ -540,7 +540,7 @@ OpenWithContainerWindow::SetCanOpen(bool on) OpenWithPoseView::OpenWithPoseView(BRect frame, uint32 resizeMask) : - BPoseView(0, frame, kListMode, resizeMask), + BPoseView(new Model(), frame, kListMode, resizeMask), fHaveCommonPreferredApp(false), fIterator(NULL) {