fixxx

1 files changed, 2 insertions, 1 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index ab69158..5a2482e 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2789,49 +2789,50 @@ void CalendarView::checkConflictForEvent()
                     if ( retVal < conflict ) {
                         conflict = retVal; 
                         cE = test;
                     }
                 }
                 found = true;
             }
         }
         test = testlist.next();
     }
     if ( found ) {
         QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( mConflictingEvent->summary(),0 ) ).arg( KGlobal::formatMessage ( cE->summary(),0 )).arg(KGlobal::locale()->formatDate(conflict.date()) ) ;
         qApp->processEvents();
         int km = KMessageBox::warningContinueCancel(this,mess,
                                                     i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!"));
         if ( km != KMessageBox::Continue )
             return;
 
         if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )
             mViewManager->showDayView();
         mNavigator->slotDaySelect( conflict.date() );
         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 ) ) );
-    }
+    } else
+        topLevelWidget()->setCaption( i18n("No conflict found") );
     mConflictingEvent = 0;
     return;
    
 }
 
 void CalendarView::updateTodoViews()
 {
     mTodoList->updateView();
     mViewManager->currentView()->updateView();
  
 }
 
 
 
 void CalendarView::clearAllViews()
 {
     mTodoList->clearList();
     mViewManager->clearAllViews();
     SearchDialog * sd = mDialogManager->getSearchDialog();
     if ( sd ) {
         KOListView* kol = sd->listview();
         if ( kol )
             kol->clearList();
     }