Changeset 6a807e7 for src/mvc/delegate.cpp

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:

• src/mvc/delegate.cpp (modified) (1 diff)

src/mvc/delegate.cpp

@@ -427 +427 @@
             if (((start >= static_cast<Event*>(parent.child(i,0).internalPointer())->start().time())
             &&
-            (start <= static_cast<Event*>(parent.child(i,0).internalPointer())->start().time().addSecs(static_cast<Event*>(parent.child(i,0).internalPointer())->duration())))
+            (start < static_cast<Event*>(parent.child(i,0).internalPointer())->start().time().addSecs(static_cast<Event*>(parent.child(i,0).internalPointer())->duration())))
             ||
-            ((end >= static_cast<Event*>(parent.child(i,0).internalPointer())->start().time())
+            ((end > static_cast<Event*>(parent.child(i,0).internalPointer())->start().time())
             &&
             (end <= static_cast<Event*>(parent.child(i,0).internalPointer())->start().time().addSecs(static_cast<Event*>(parent.child(i,0).internalPointer())->duration()))))