Fixed issue #6, where texture were not removable.

Xeeynamo · Dec 28, 2017 · 734d4e8 · 734d4e8
1 parent 7b1cd01
commit 734d4e8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/AnimationEditor/Properties/AssemblyInfo.cs b/AnimationEditor/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.0")]
-[assembly: AssemblyFileVersion("1.2.1.0")]
+[assembly: AssemblyVersion("1.2.2.0")]
+[assembly: AssemblyFileVersion("1.2.2.0")]
diff --git a/AnimationEditor/TextureWindow.xaml.cs b/AnimationEditor/TextureWindow.xaml.cs
@@ -61,7 +61,6 @@ private void ButtonAdd_Click(object sender, RoutedEventArgs e)
                 if (fileName != null)
                 {
                     ViewModel.AddTexture(fileName);
-                    MainViewModel.AnimationData.SpriteSheets.Add(fileName);
                     SelectedIndex = ViewModel.Count - 1;
                 }
             }

diff --git a/AnimationEditor/ViewModels/MainViewModel.cs b/AnimationEditor/ViewModels/MainViewModel.cs
@@ -700,6 +700,8 @@ public bool ChangeCurrentAnimationName(string name)
 
         public void SaveChanges()
         {
+            _animationData.SpriteSheets.Clear();
+            _animationData.SpriteSheets.AddRange(Textures);
             _animationData.SetAnimations(Animations);
             if (IsHitboxV3)
             {

diff --git a/AnimationEditor/ViewModels/TextureWindowViewModel.cs b/AnimationEditor/ViewModels/TextureWindowViewModel.cs
@@ -33,7 +33,10 @@ public string SelectedValue
             set
             {
                 _selectedValue = value;
-                CurrentTexture = new TextureViewModel(value, BasePath);
+                if (_selectedValue != null)
+                    CurrentTexture = new TextureViewModel(value, BasePath);
+                else
+                    CurrentTexture = null;
                 OnPropertyChanged(nameof(SelectedValue));
                 OnPropertyChanged(nameof(IsValueSelected));
                 OnPropertyChanged(nameof(CurrentTexture));