diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index d3ff343c..08b32026 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/Switch_Toolbox_Library/Forms/Editors/AnimationPanel.cs b/Switch_Toolbox_Library/Forms/Editors/AnimationPanel.cs index cd03152b..bc83e680 100644 --- a/Switch_Toolbox_Library/Forms/Editors/AnimationPanel.cs +++ b/Switch_Toolbox_Library/Forms/Editors/AnimationPanel.cs @@ -366,6 +366,8 @@ namespace Switch_Toolbox.Library Dispose(); } + + private void AnimationPanel_Load(object sender, EventArgs e) { Viewport viewport = LibraryGUI.Instance.GetActiveViewport(); diff --git a/Toolbox/MainForm.cs b/Toolbox/MainForm.cs index 89f18091..b07b2da8 100644 --- a/Toolbox/MainForm.cs +++ b/Toolbox/MainForm.cs @@ -584,7 +584,7 @@ namespace Toolbox } else if (ActiveMdiChild is ImageEditorForm) { - return ((ImageEditorForm)ActiveMdiChild).GetActiveFile(); + return ((ImageEditorForm)ActiveMdiChild).GetActiveFile(); } else if (ActiveMdiChild is AudioPlayer) { @@ -715,7 +715,7 @@ namespace Toolbox private void settingsToolStripMenuItem_Click(object sender, EventArgs e) { - + } private void MainForm_DragEnter(object sender, DragEventArgs e) @@ -765,6 +765,14 @@ namespace Toolbox } } + private void ResetAnimPanel() + { + if (LibraryGUI.Instance.GetAnimationPanel() != null) + { + LibraryGUI.Instance.GetAnimationPanel().CurrentAnimation = null; + } + } + private void MainForm_MdiChildActivate(object sender, EventArgs e) { if (this.ActiveMdiChild == null) @@ -775,6 +783,8 @@ namespace Toolbox // If no any child form, hide tabControl else { + ResetAnimPanel(); + // If child form is new and no has tabPage, // create new tabPage if (this.ActiveMdiChild.Tag == null)