Minor fixes: max slot number is now 14 and the debug mode could not b…

…e compiled.
tmedwards · Jul 13, 2015 · 250efdd · 250efdd
1 parent 7b7e2fb
commit 250efdd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/CoCEd/App.xaml.cs b/CoCEd/App.xaml.cs
@@ -147,7 +147,7 @@ void Initialize()
         static AmfFile AutoLoad(FlashDirectory[] directories)
         {
             var file = directories[0].Files[0];
-            VM.Instance.Load(file.FilePath, createBackup: true);
+            VM.Instance.Load(file.FilePath, SerializationFormat.Slot, createBackup: true);
             return file;
         }
 

diff --git a/CoCEd/Common/UpdatableCollection.cs b/CoCEd/Common/UpdatableCollection.cs
@@ -267,8 +267,8 @@ object ICollection.SyncRoot
 
     public sealed class UpdatableCollection<T> : UpdatableCollection<T, T>
     {
-        public UpdatableCollection(IEnumerable<T> source)
-            : base(source, x => x)
+        public UpdatableCollection(IEnumerable<T> initialItems)
+            : base(initialItems, x => x)
         {
         }
     }

diff --git a/CoCEd/Model/FileManager.cs b/CoCEd/Model/FileManager.cs
@@ -40,7 +40,7 @@ public static class FileManager
 
         const int MaxBackupFiles = 10;
         public const int SaveSlotsLowerBound = 1;
-        public const int SaveSlotsUpperBound = 9;
+        public const int SaveSlotsUpperBound = 14;
 
         public static string PathWithMissingPermissions { get; private set; }
 

diff --git a/CoCEd/ViewModel/VM.cs b/CoCEd/ViewModel/VM.cs
@@ -185,7 +185,9 @@ public void UpdateAppTitle()
             if (SaveRequired) title += "\u202F*";
             if (IsRevampMod) title += "  [Revamp-Mod]";
             title += "  |  " + AppTitle;
-            Application.Current.MainWindow.Title = title; // Databinding does not work for this
+
+            if (Application.Current.MainWindow != null)         // May be null on autoload.
+                Application.Current.MainWindow.Title = title;   // Databinding does not work for this
         }
 
         public void NotifySaveRequiredChanged(bool saveRequired = true)