changed conditions for conflicts

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index 07001f1a29180fd97dff64f470b1369a76d051a6..a65bb4ba1709eedf6db1b85a175c5ce9372225c7 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -73,9 +73,9 @@ QList<Event> Event::conflictEvents(int aEventId, int conferenceId)
     QSqlQuery query;
     Event event = Event::getById(aEventId,conferenceId);
     query.prepare(selectQuery() + "WHERE xid_conference = :conf AND ( \
-           ( start <= :start1 AND ( start + duration ) >= :start2 ) \
-        OR ( start >= :start3 AND ( start + duration ) <= :end1 ) \
-        OR ( start <= :end2  AND ( start + duration ) >= :end3 ) ) AND favourite = 1 AND NOT id = :id ORDER BY start");
+           ( start < :start1 AND ( start + duration ) > :start2 ) \
+        OR ( start > :start3 AND ( start + duration ) < :end1 ) \
+        OR ( start < :end2  AND ( start + duration ) > :end3 ) ) AND favourite = 1 AND NOT id = :id ORDER BY start");
     query.bindValue(":conf", event.conferenceId());
     query.bindValue(":start1", convertToDb(event.start(), QVariant::DateTime));
     query.bindValue(":start2", convertToDb(event.start(), QVariant::DateTime));