fixxx

1 files changed, 2 insertions, 3 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 2582931..68d1bc6 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2749,3 +2749,3 @@ void CalendarView::checkConflictForEvent()
     if ( ! mConflictingEvent ) return;
-    if ( mConflictingEvent->doesFloat() )  {
+    if (  mConflictingEvent->isHoliday() || mConflictingEvent->isBirthday() || mConflictingEvent->isAnniversary() ) {
         mConflictingEvent = 0;
@@ -2791,5 +2791,4 @@ void CalendarView::checkConflictForEvent()
         topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) );
-        return;
     }
-
+    mConflictingEvent = 0;
     return;