1 files changed, 1 insertions, 1 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 898da6c..e3b62de 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3009,49 +3009,49 @@ void CalendarView::changeIncidenceDisplay(Incidence *which, int action)
 
 // most of the changeEventDisplays() right now just call the view's
 // total update mode, but they SHOULD be recoded to be more refresh-efficient.
 void CalendarView::changeEventDisplay(Event *which, int action)
 {
     //  kdDebug() << "CalendarView::changeEventDisplay" << endl;
     changeIncidenceDisplay((Incidence *)which,  action);
     static bool clearallviews = false;
     if ( KOPrefs::instance()->mGlobalUpdateDisabled ) {
         if ( clearallviews ) {
             clearAllViews();
             clearallviews = false;
         }
         return;
     }
     clearallviews = true;
     mDateNavigator->updateView();
     //mDialogManager->updateSearchDialog();
     if (which) {
         // If there is an event view visible update the display
         mViewManager->currentView()->changeEventDisplay(which,action);
         // TODO: check, if update needed
         //    if (which->getTodoStatus()) {
         mTodoList->updateView();
-        if (  action != KOGlobals::EVENTDELETED ) {
+        if (  action != KOGlobals::EVENTDELETED && KOPrefs::instance()->mDetectConflicts ) {
             mConflictingEvent = which ;
             int time = 1000;
 #ifdef DESKTOP_VERSION
             time = 500;
 #endif
             bool checkC = false;
             if ( mConflictingEvent->doesFloat() ) {
                 checkC = KOPrefs::instance()->mCheckConflictsAllDayAllDay 
                     || KOPrefs::instance()->mCheckConflictsAllDayNonAD;
             } else {
                 checkC = KOPrefs::instance()->mCheckConflictsNonADAllDay  
                     || KOPrefs::instance()->mCheckConflictsNonADNonAD;
             }
             if ( checkC )
                 QTimer::singleShot( time, this, SLOT ( checkConflictForEvent() ) );
         }
         //    }
     } else {
         mViewManager->currentView()->updateView();
     }
 }
 void CalendarView::checkConflictForEvent()
 {