[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/kphotoalbum/ImportExport
From:       Jesper Pedersen <blackie () blackie ! dk>
Date:       2008-07-15 15:17:25
Message-ID: 1216135045.506118.11707.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 832827 by blackie:

If none of the images were to be copied during an import, then we flushed \
the loop before we got started, in that case, don't start the loop.

 M  +8 -2      ImportHandler.cpp  


--- trunk/extragear/graphics/kphotoalbum/ImportExport/ImportHandler.cpp \
#832826:832827 @@ -1,7 +1,6 @@
 #include "ImportHandler.h"
 #include "KimFileReader.h"
 #include "ImportSettings.h"
-#include <QDebug>
 #include <QComboBox>
 #include <QCheckBox>
 #include <QApplication>
@@ -34,7 +33,12 @@
     bool ok;
     if ( m_settings.externalSource() ) {
         copyFromExternal();
-        ok = m_eventLoop.exec();
+
+        // If none of the images were to be copied, then we flushed the \
loop before we got started, in that case, don't start the loop. +        if \
( _pendingCopies.count() > 0 ) +            ok = m_eventLoop.exec();
+        else
+            ok = false;
     }
     else {
         ok = copyFilesFromZipFile();
@@ -64,6 +68,7 @@
     // JKP - handle the situation where we should not copy, as the image \
already is in the DB  DB::ImageInfoPtr info = _pendingCopies[0];
     _pendingCopies.pop_front();
+
     QString fileName = info->fileName( true );
     KUrl src1 = m_settings.kimFile();
     KUrl src2 = m_settings.baseURL();
@@ -151,6 +156,7 @@
         if ( _progress->wasCanceled() )
             break;
     }
+
     Browser::BrowserWidget::instance()->home();
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]