From 6a807e71a7ec304b50478f6280a7e991c8d36b99 Mon Sep 17 00:00:00 2001 From: fortefr Date: Thu, 21 Jan 2010 13:42:33 +0000 Subject: [PATCH] Time conflict fix --- src/mvc/delegate.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp index 6f620b2..a566e59 100644 --- 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(parent.child(i,0).internalPointer())->start().time()) && - (start <= static_cast(parent.child(i,0).internalPointer())->start().time().addSecs(static_cast(parent.child(i,0).internalPointer())->duration()))) + (start < static_cast(parent.child(i,0).internalPointer())->start().time().addSecs(static_cast(parent.child(i,0).internalPointer())->duration()))) || - ((end >= static_cast(parent.child(i,0).internalPointer())->start().time()) + ((end > static_cast(parent.child(i,0).internalPointer())->start().time()) && (end <= static_cast(parent.child(i,0).internalPointer())->start().time().addSecs(static_cast(parent.child(i,0).internalPointer())->duration())))) { -- 2.39.5