| -rw-r--r-- | korganizer/calendarview.cpp | 2 |
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 @@ -3029,9 +3029,9 @@ void CalendarView::changeEventDisplay(Event *which, int action) 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; |