Really unload folders before reconfiguring.

src/mirall/folderman.cpp

@@ -79,20 +79,28 @@ void FolderMan::slotReparseConfiguration()
     setupKnownFolders();
 }
 
-
+int FolderMan::unloadAllFolders()
-int FolderMan::setupKnownFolders()
 {
-  qDebug() << "* Setup folders from " << _folderConfigPath;
-
     // first terminate sync jobs.
     terminateCurrentSync();
 
+    int cnt = 0;
+
     // clear the list of existing folders.
     Folder::MapIterator i(_folderMap);
     while (i.hasNext()) {
         i.next();
         delete _folderMap.take( i.key() );
+        cnt++;
     }
+    return cnt;
+}
+
+int FolderMan::setupKnownFolders()
+{
+  qDebug() << "* Setup folders from " << _folderConfigPath;
+
+  unloadAllFolders();
 
   QDir dir( _folderConfigPath );
   dir.setFilter(QDir::Files);

src/mirall/folderman.h

@@ -104,6 +104,9 @@ public slots:
 
     void terminateSyncProcess( const QString& alias = QString::null );
 
+    /* delete all folder objects */
+    int unloadAllFolders();
+
     // if enabled is set to false, no new folders will start to sync.
     // the current one will finish.
     void setSyncEnabled( bool );

src/mirall/owncloudsetupwizard.cpp

@@ -128,7 +128,7 @@ void OwncloudSetupWizard::slotAssistantFinished( int result )
         bool acceptCfg = true;
 
         if( urlHasChanged ) {
-            _folderMan->terminateSyncProcess( QString::null ); // terminate the current sync.
+            _folderMan->unloadAllFolders();
 
            bool startFromScratch = _ocWizard->field( "OCSyncFromScratch" ).toBool();
             if( startFromScratch ) {