fixx

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
@@ -745,3 +745,3 @@ void CalendarView::nextConflict( bool all, bool allday )
     topLevelWidget()->setCaption( i18n("No conflict found") );
-    qDebug("No conflict found ");
+    //qDebug("No conflict found ");
     block = false;
@@ -2830,2 +2830,3 @@ void CalendarView::checkConflictForEvent()
     }
+    topLevelWidget()->setCaption( i18n("KO/Pi") );
     if ( found ) {
@@ -2835,5 +2836,5 @@ void CalendarView::checkConflictForEvent()
                                                     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 )
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 7ce3f1f..6a6fff9 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -367,3 +367,3 @@ void KOCalEditView::addCal()
     bool tryagain = true;
-    QString name, file;
+    QString name, file = KGlobalSettings::calendarDir()+"newCal.ics";
     while ( tryagain ) {
@@ -388,3 +388,3 @@ void KOCalEditView::addCal()
                 tryagain = true;  
-                file = "";
+                file = KGlobalSettings::calendarDir()+"newCal.ics";
                 break;
@@ -392,2 +392,6 @@ void KOCalEditView::addCal()
             kkf = KOPrefs::instance()->mCalendars.next();
+        } 
+        QFileInfo fi ( file );
+        if ( fi.isDir() ) {
+            tryagain = true;  
         }
@@ -395,3 +399,3 @@ void KOCalEditView::addCal()
     addCalendar ( name, file );
-    QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); 
+    QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) );
 }