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
@@ -2744,13 +2744,13 @@ void CalendarView::changeEventDisplay(Event *which, int action)
 void CalendarView::checkConflictForEvent()
 {
 
     if (!KOPrefs::instance()->mConfirm)
         return;
     if ( ! mConflictingEvent ) return;
-    if ( mConflictingEvent->doesFloat() )  {
+    if (  mConflictingEvent->isHoliday() || mConflictingEvent->isBirthday() || mConflictingEvent->isAnniversary() ) {
         mConflictingEvent = 0;
         return;
     }
     QPtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     QDateTime conflict;
@@ -2786,15 +2786,14 @@ void CalendarView::checkConflictForEvent()
         if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )
             mViewManager->showDayView();
         mNavigator->slotDaySelect( conflict.date() );
         int hour = conflict.time().hour();
         mViewManager->agendaView()->setStartHour( hour  );
         topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) );
-        return;
     }
-
+    mConflictingEvent = 0;
     return;
    
 }
 
 void CalendarView::updateTodoViews()
 {