Clean up Loaded event handler

so that it doesn't fire every time document is made active. Fixes #142
tgjones · Sep 20, 2015 · 238337f · 238337f
1 parent 4e1ec6b
commit 238337f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Gemini/Modules/Shell/Commands/NewFileCommandHandler.cs b/src/Gemini/Modules/Shell/Commands/NewFileCommandHandler.cs
@@ -51,7 +51,14 @@ public Task Run(Command command)
             viewAware.ViewAttached += (sender, e) =>
             {
                 var frameworkElement = (FrameworkElement)e.View;
-                frameworkElement.Loaded += async (sender2, e2) => await tag.EditorProvider.New(editor, string.Format(Resources.FileNewUntitled, (_newFileCounter++) + tag.FileType.FileExtension));
+
+                RoutedEventHandler loadedHandler = null;
+                loadedHandler = async (sender2, e2) =>
+                {
+                    frameworkElement.Loaded -= loadedHandler;
+                    await tag.EditorProvider.New(editor, string.Format(Resources.FileNewUntitled, (_newFileCounter++) + tag.FileType.FileExtension));
+                };
+                frameworkElement.Loaded += loadedHandler;
             };
 
             _shell.OpenDocument(editor);

diff --git a/src/Gemini/Modules/Shell/Commands/OpenFileCommandHandler.cs b/src/Gemini/Modules/Shell/Commands/OpenFileCommandHandler.cs
@@ -52,7 +52,14 @@ internal static Task<IDocument> GetEditor(string path)
             viewAware.ViewAttached += (sender, e) =>
             {
                 var frameworkElement = (FrameworkElement) e.View;
-                frameworkElement.Loaded += async (sender2, e2) => await provider.Open(editor, path);
+
+                RoutedEventHandler loadedHandler = null;
+                loadedHandler = async (sender2, e2) =>
+                {
+                    frameworkElement.Loaded -= loadedHandler;
+                    await provider.Open(editor, path);
+                };
+                frameworkElement.Loaded += loadedHandler;
             };
 
             return Task.FromResult(editor);