ensure the old backup folder gets removed

diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp
index 8d97ebf82a96c2e788157757bee35e2a568dfd9c..cca76f434e97b52cd64084f91fad2a776ba29a4f 100644 (file)
--- a/src/SHAPERGUI/SHAPERGUI.cpp
+++ b/src/SHAPERGUI/SHAPERGUI.cpp
@@ -932,11 +932,13 @@ void SHAPERGUI::onBackupDone(QString aFolder, bool aResult)
       //  * <FileName>_valid.log - the output of the "check_validity.py" script
       QDir dir(myLastBackupFolder);
       QStringList files = dir.entryList(QDir::Files|QDir::Dirs|QDir::NoDotAndDotDot);
-      if (!files.isEmpty() && files.length() <= 3) {
+      if (!files.isEmpty() && files.length() <= 5) {
         QString baseName = files.constFirst();
         baseName = baseName.left(baseName.lastIndexOf('.'));
-        if (!baseName.isEmpty() && files.filter(baseName).length() == files.length())
+        if (!baseName.isEmpty() && files.filter(baseName).length() == files.length()) {
+          MSGEL("........removing old backup folder");
           dir.removeRecursively();
+        }
       }
     }
     myLastBackupFolder = aFolder;
@@ -1414,7 +1416,9 @@ void SHAPERGUI::preferencesChanged(const QString& theSection, const QString& the
       if (useBackup) {
         int backupInterval = aResMgr->integerValue( ModuleBase_Preferences::GENERAL_SECTION, "backup_interval", 1 );
         if ( backupInterval > 0 ){
-          backupInterval = 1;
+#ifdef DBG_BACKUP_INTERVAL
+          backupInterval = DBG_BACKUP_INTERVAL; // MBS: use shorter interval for debugging
+#endif
           MSGEL("....starting BackupTimer: interval=" << backupInterval << " min");
           myBackupTimer->start( backupInterval*60000 );
         }