Time conflict fix

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 6f620b2a3e098638c837e388ba556e040366e9c4..a566e595858ff2317a6132fd4cd3f1ce9f9ce917 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -426,9 +426,9 @@ bool Delegate::hasTimeConflict(const QModelIndex &index, const QModelIndex &pare
         {
             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()))))
             {