Changeset 6a807e7 for src


Ignore:
Timestamp:
01/21/10 14:42:33 (13 years ago)
Author:
fortefr <fortefr@…>
Branches:
master, qt5
Children:
9d8946b
Parents:
699d5b8
Message:

Time conflict fix

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/mvc/delegate.cpp

    r699d5b8 r6a807e7  
    427427            if (((start >= static_cast<Event*>(parent.child(i,0).internalPointer())->start().time())
    428428            &&
    429             (start <= static_cast<Event*>(parent.child(i,0).internalPointer())->start().time().addSecs(static_cast<Event*>(parent.child(i,0).internalPointer())->duration())))
     429            (start < static_cast<Event*>(parent.child(i,0).internalPointer())->start().time().addSecs(static_cast<Event*>(parent.child(i,0).internalPointer())->duration())))
    430430            ||
    431             ((end >= static_cast<Event*>(parent.child(i,0).internalPointer())->start().time())
     431            ((end > static_cast<Event*>(parent.child(i,0).internalPointer())->start().time())
    432432            &&
    433433            (end <= static_cast<Event*>(parent.child(i,0).internalPointer())->start().time().addSecs(static_cast<Event*>(parent.child(i,0).internalPointer())->duration()))))
Note: See TracChangeset for help on using the changeset viewer.