From 0b37bd9c635bfb2b37a5760af30632c2b8855b02 Mon Sep 17 00:00:00 2001
From: manongjohn <dancel@ptd.net>
Date: Sep 07 2019 23:29:05 +0000
Subject: Fix backup ext. and sequenced files.


---

diff --git a/toonz/sources/toonzlib/toonzscene.cpp b/toonz/sources/toonzlib/toonzscene.cpp
index ccd1635..5da6ea5 100644
--- a/toonz/sources/toonzlib/toonzscene.cpp
+++ b/toonz/sources/toonzlib/toonzscene.cpp
@@ -180,12 +180,11 @@ static void saveBackup(TFilePath path) {
     std::string bakExt =
         ".bak" + (totalBackups > 0 ? std::to_string(totalBackups) : "");
     backup = path.withType(path.getType() + bakExt);
-    if (!TSystem::doesExistFileOrLevel(backup)) continue;
-    try {
-      if (TSystem::doesExistFileOrLevel(prevBackup))
-        TSystem::removeFileOrLevel_throw(prevBackup);
-      TSystem::copyFileOrLevel_throw(prevBackup, backup);
-    } catch (...) {
+    if (TSystem::doesExistFileOrLevel(backup)) {
+      try {
+        TSystem::copyFileOrLevel_throw(prevBackup, backup);
+      } catch (...) {
+      }
     }
     prevBackup = backup;
   }
diff --git a/toonz/sources/toonzlib/txshsimplelevel.cpp b/toonz/sources/toonzlib/txshsimplelevel.cpp
index 50a9435..94cd4c4 100644
--- a/toonz/sources/toonzlib/txshsimplelevel.cpp
+++ b/toonz/sources/toonzlib/txshsimplelevel.cpp
@@ -1374,6 +1374,19 @@ void TXshSimpleLevel::save() {
 //-----------------------------------------------------------------------------
 
 static void saveBackup(TFilePath path) {
+  // The additional .bak extension keeps it from being detected as a sequence.
+  // If the original path is a sequence, find the individual files and back it
+  // up individually
+  if (path.isLevelName()) {
+    TFilePathSet files =
+        TSystem::readDirectory(path.getParentDir(), false, true);
+    for (TFilePathSet::iterator file = files.begin(); file != files.end();
+         file++) {
+      if (file->getLevelName() == path.getLevelName()) saveBackup(*file);
+    }
+    return;
+  }
+
   int totalBackups = Preferences::instance()->getBackupKeepCount();
   totalBackups -= 1;
   TFilePath backup = path.withType(path.getType() + ".bak");
@@ -1383,12 +1396,11 @@ static void saveBackup(TFilePath path) {
     std::string bakExt =
         ".bak" + (totalBackups > 0 ? std::to_string(totalBackups) : "");
     backup = path.withType(path.getType() + bakExt);
-    if (!TSystem::doesExistFileOrLevel(backup)) continue;
-    try {
-      if (TSystem::doesExistFileOrLevel(prevBackup))
-        TSystem::removeFileOrLevel_throw(prevBackup);
-      TSystem::copyFileOrLevel_throw(prevBackup, backup);
-    } catch (...) {
+    if (TSystem::doesExistFileOrLevel(backup)) {
+      try {
+        TSystem::copyFileOrLevel_throw(prevBackup, backup);
+      } catch (...) {
+      }
     }
     prevBackup = backup;
   }