From a685e90ea183cba87e852d6f6272e54704034347 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 17 Aug 2005 22:49:32 +0000
Subject: oops

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

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 898da6c..e3b62de 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3030,7 +3030,7 @@ void CalendarView::changeEventDisplay(Event *which, int 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
--
cgit v0.9.0.2