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

List:       kde-commits
Subject:    kdeextragear-1/amarok/src
From:       Stefan Siegel <kde () sdas ! de>
Date:       2005-02-02 18:30:05
Message-ID: 20050202183005.B3D661D00E () office ! kde ! org
[Download RAW message or body]

CVS commit by siegel: 

Keep the old collection when canceling a rescan


  M +11 -8     collectionreader.cpp   1.24


--- kdeextragear-1/amarok/src/collectionreader.cpp  #1.23:1.24
@@ -134,4 +134,5 @@ CollectionReader::doJob()
     }
 
+    if ( !isAborted() ) {
     if ( !m_incremental )
         CollectionDB::instance()->clearTables();
@@ -142,9 +143,11 @@ CollectionReader::doJob()
     // rename tables
     CollectionDB::instance()->moveTempTables( m_db );
+    }
+
     CollectionDB::instance()->dropTables( m_db );
 
     log.close();
 
-    return true;
+    return !isAborted();
 }
 


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