diff options
author | Mike Krüger <mikkrg@microsoft.com> | 2019-05-29 14:27:11 +0300 |
---|---|---|
committer | Mike Krüger <mikkrg@microsoft.com> | 2019-06-04 09:32:22 +0300 |
commit | 800c10b8d37ebc6aeb9367390bc3015244614701 (patch) | |
tree | 8d161e171e8dd33b8192561cd693ecfa8be02f70 /main/src/addins | |
parent | 2adc4c688539386a99182246487a90983bd81d84 (diff) |
[Ide] Added a disposed token to the document controller API.
The disposed token can be used by continue with calls that shouldn't
continue on disposed instances.
Diffstat (limited to 'main/src/addins')
2 files changed, 6 insertions, 16 deletions
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs index 2e2740eea2..15a38cfc9f 100644 --- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs +++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs @@ -64,7 +64,6 @@ namespace MonoDevelop.AssemblyBrowser { DocumentTitle = GettextCatalog.GetString ("Assembly Browser"); widget = new AssemblyBrowserWidget (); - IsDisposed = false; FillWidget (); } @@ -104,14 +103,8 @@ namespace MonoDevelop.AssemblyBrowser widget.EnsureDefinitionsLoaded (definitions); } - public bool IsDisposed { - get; - private set; - } - protected override void OnDispose () { - IsDisposed = true; if (currentWs != null) currentWs.WorkspaceLoaded -= Handle_WorkspaceLoaded; diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs index 4a46c93df7..1bbfbb0e4b 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs @@ -1,4 +1,4 @@ -// +// // Copyright (c) Microsoft Corp. (https://www.microsoft.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -291,14 +291,11 @@ namespace MonoDevelop.TextEditor Components.Control control; - bool isDisposed; protected override void OnDispose () { - if (isDisposed) + if (IsDisposed) return; - isDisposed = true; - textBufferRegistration?.Dispose (); textBufferRegistration = null; @@ -579,7 +576,7 @@ namespace MonoDevelop.TextEditor Task autoSaveTask; void InformAutoSave () { - if (isDisposed) + if (IsDisposed) return; RemoveAutoSaveTimer (); autoSaveTimer = GLib.Timeout.Add (500, delegate { @@ -725,7 +722,7 @@ namespace MonoDevelop.TextEditor void ReloadFromDisk () { try { - if (isDisposed || !File.Exists (FilePath)) + if (IsDisposed || !File.Exists (FilePath)) return; Load (true); @@ -739,7 +736,7 @@ namespace MonoDevelop.TextEditor void KeepChanges () { - if (isDisposed) + if (IsDisposed) return; ShowNotification = false; DismissInfoBar (); @@ -841,4 +838,4 @@ namespace MonoDevelop.TextEditor => throw new NotImplementedException (); } } -}
\ No newline at end of file +} |