From kde-commits  Tue Jul 15 15:36:21 2008
From: Jesper Pedersen <blackie () blackie ! dk>
Date: Tue, 15 Jul 2008 15:36:21 +0000
To: kde-commits
Subject: extragear/graphics/kphotoalbum/ImportExport
Message-Id: <1216136181.788589.12551.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=121613620317070

SVN commit 832835 by blackie:

handle the situation where the MD5 sum matches an image in the DB when importing from remote .kim file.

 M  +5 -1      ImportHandler.cpp  


--- trunk/extragear/graphics/kphotoalbum/ImportExport/ImportHandler.cpp #832834:832835
@@ -65,10 +65,14 @@
 
 void ImportExport::ImportHandler::copyNextFromExternal()
 {
-    // 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();
 
+    if ( isImageAlreadyInDB( info ) ) {
+        aCopyJobCompleted(0);
+        return;
+    }
+
     QString fileName = info->fileName( true );
     KUrl src1 = m_settings.kimFile();
     KUrl src2 = m_settings.baseURL();