Or is also a keyword.
This commit is contained in:
@@ -476,19 +476,19 @@ Events::FromMessage(const BMessenger& target, const BMessage& message)
|
|||||||
/*static*/ Event*
|
/*static*/ Event*
|
||||||
Events::AddOnDemand(Event* event)
|
Events::AddOnDemand(Event* event)
|
||||||
{
|
{
|
||||||
OrEvent* or = dynamic_cast<OrEvent*>(event);
|
OrEvent* orEvent = dynamic_cast<OrEvent*>(event);
|
||||||
if (or == NULL) {
|
if (orEvent == NULL) {
|
||||||
EventContainer* container = dynamic_cast<EventContainer*>(event);
|
EventContainer* container = dynamic_cast<EventContainer*>(event);
|
||||||
if (container == NULL)
|
if (container == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
or = new OrEvent(container->Owner(), container->Target());
|
orEvent = new OrEvent(container->Owner(), container->Target());
|
||||||
}
|
}
|
||||||
if (or != event && event != NULL)
|
if (orEvent != event && event != NULL)
|
||||||
or->AddEvent(event);
|
orEvent->AddEvent(event);
|
||||||
|
|
||||||
or->AddEvent(new DemandEvent(or));
|
orEvent->AddEvent(new DemandEvent(orEvent));
|
||||||
return or;
|
return orEvent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user