From 9635c9a7b8f5c19a1784079d4b67cb3ca600fc33 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Thu, 07 Jul 2005 22:42:31 +0000
Subject: fixxx

---
(limited to 'korganizer/calendarview.cpp')

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 2582931..68d1bc6 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2747,7 +2747,7 @@ void CalendarView::checkConflictForEvent()
     if (!KOPrefs::instance()->mConfirm)
         return;
     if ( ! mConflictingEvent ) return;
-    if ( mConflictingEvent->doesFloat() )  {
+    if (  mConflictingEvent->isHoliday() || mConflictingEvent->isBirthday() || mConflictingEvent->isAnniversary() ) {
         mConflictingEvent = 0;
         return;
     }
@@ -2789,9 +2789,8 @@ void CalendarView::checkConflictForEvent()
         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;
    
 }
--
cgit v0.9.0.2