Skip to content

Commit

Permalink
Tracker: Fix accidental logic reversal in a66ee36
Browse files Browse the repository at this point in the history
should be: if (!container || suppressFolderHierarchy)

also rename container to isContainer
  • Loading branch information
jscipione committed Jun 21, 2014
1 parent 546ec3b commit 7dbe212
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions src/kits/tracker/NavMenu.cpp
Expand Up @@ -393,6 +393,7 @@ BNavMenu::ClearMenuBuildingState()
int32 count = fItemList->CountItems();
for (int32 index = count - 1; index >= 0; index--)
delete RemoveItem(index);

delete fItemList;
fItemList = NULL;
}
Expand Down Expand Up @@ -579,7 +580,7 @@ BNavMenu::NewModelItem(Model* model, const BMessage* invokeMessage,
return 0;

entry_ref ref;
bool container = false;
bool isContainer = false;
if (model->IsSymLink()) {
Model* newResolvedModel = 0;
Model* result = model->LinkTo();
Expand Down Expand Up @@ -617,13 +618,13 @@ BNavMenu::NewModelItem(Model* model, const BMessage* invokeMessage,
}

ref = *result->EntryRef();
container = result->IsContainer();
isContainer = result->IsContainer();
}

model->SetLinkTo(result);
} else {
ref = *model->EntryRef();
container = model->IsContainer();
isContainer = model->IsContainer();
}

BMessage* message = new BMessage(*invokeMessage);
Expand All @@ -635,7 +636,7 @@ BNavMenu::NewModelItem(Model* model, const BMessage* invokeMessage,
GetMaxMenuWidth());

ModelMenuItem* item = NULL;
if (container || suppressFolderHierarchy) {
if (!isContainer || suppressFolderHierarchy) {
item = new ModelMenuItem(model, truncatedString.String(), message);
if (invokeMessage->what != B_REFS_RECEIVED)
item->SetEnabled(false);
Expand All @@ -644,7 +645,6 @@ BNavMenu::NewModelItem(Model* model, const BMessage* invokeMessage,
} else {
BNavMenu* menu = new BNavMenu(truncatedString.String(),
invokeMessage->what, target, parentWindow, typeslist);

menu->SetNavDir(&ref);
if (hook != NULL) {
menu->InitTrackingHook(hook->fTrackingHook, &(hook->fTarget),
Expand Down Expand Up @@ -801,12 +801,11 @@ BNavMenu::AddNavParentDir(const char* name,const Model* model,
menu->SetNavDir(model->EntryRef());
menu->SetShowParent(true);
menu->InitTrackingHook(fTrackingHook.fTrackingHook,
&fTrackingHook.fTarget, fTrackingHook.fDragMessage);
&(fTrackingHook.fTarget), fTrackingHook.fDragMessage);

BMenuItem* item = new SpecialModelMenuItem(model, menu);

BMessage* message = new BMessage(what);
message->AddRef("refs",model->EntryRef());
message->AddRef("refs", model->EntryRef());
item->SetMessage(message);

AddItem(item);
Expand Down

0 comments on commit 7dbe212

Please sign in to comment.