| author | zautrix <zautrix> | 2005-08-17 22:49:32 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-08-17 22:49:32 (UTC) |
| commit | a685e90ea183cba87e852d6f6272e54704034347 (patch) (side-by-side diff) | |
| tree | f773086786d564866c4d5b7ca08fb510ebf0eb0b | |
| parent | ede1d2a3a3d772cabc54ec117006ec6f445485cc (diff) | |
| download | kdepimpi-a685e90ea183cba87e852d6f6272e54704034347.zip kdepimpi-a685e90ea183cba87e852d6f6272e54704034347.tar.gz kdepimpi-a685e90ea183cba87e852d6f6272e54704034347.tar.bz2 | |
oops
| -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 @@ -3027,13 +3027,13 @@ void CalendarView::changeEventDisplay(Event *which, int action) 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; |