2 files changed, 11 insertions, 6 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 9674921..3ab4bb4 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -740,13 +740,13 @@ void CalendarView::nextConflict( bool all, bool allday )
         topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) );
         block = false;
         return;
     }
 
     topLevelWidget()->setCaption( i18n("No conflict found") );
-    qDebug("No conflict found ");
+    //qDebug("No conflict found ");
     block = false;
     return;
 }
 
 void CalendarView::conflictAll()
 {
@@ -2825,20 +2825,21 @@ void CalendarView::checkConflictForEvent()
                 }
                 found = true;
             }
         }
         test = testlist.next();
     }
+    topLevelWidget()->setCaption( i18n("KO/Pi") );
     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 )
+        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 ) ) );
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 7ce3f1f..6a6fff9 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -362,13 +362,13 @@ void KOCalEditView::defaultInfo()
 {
     KMessageBox::information( this,  i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") ); 
 }
 void KOCalEditView::addCal()
 {
     bool tryagain = true;
-    QString name, file;
+    QString name, file = KGlobalSettings::calendarDir()+"newCal.ics";
     while ( tryagain ) {
         KONewCalPrefs prefs ( this ); 
         prefs.nameE->setText( name );
         prefs.url->setURL( file );
         if ( !  prefs.exec() )
             return;
@@ -383,20 +383,24 @@ void KOCalEditView::addCal()
                 tryagain = true;  
                 break;
             }
             if ( kkf->mFileName == file ) {
                 KMessageBox::information( this,  i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg(  KGlobal::formatMessage (file, 0 )) ); 
                 tryagain = true;  
-                file = "";
+                file = KGlobalSettings::calendarDir()+"newCal.ics";
                 break;
             }
             kkf = KOPrefs::instance()->mCalendars.next();
+        } 
+        QFileInfo fi ( file );
+        if ( fi.isDir() ) {
+            tryagain = true;  
         }
     }
     addCalendar ( name, file );
-    QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); 
+    QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) );
 }
 int KOCalEditView::addCalendar( QString name, QString file, bool ask )
 {
   
     QFileInfo fi ( file );
     QString absFile = file;