diff --git a/Stylet/Screen.cs b/Stylet/Screen.cs index 71fcdff..852d0dc 100644 --- a/Stylet/Screen.cs +++ b/Stylet/Screen.cs @@ -21,11 +21,19 @@ namespace Stylet #region WeakEventManager - private Lazy lazyWeakEventManager = new Lazy(() => new WeakEventManager(), true); + private IWeakEventManager _weakEventManager; /// /// WeakEventManager owned by this screen (lazy) /// - protected IWeakEventManager weakEventManager { get { return this.lazyWeakEventManager.Value; } } + protected IWeakEventManager weakEventManager + { + get + { + if (this._weakEventManager == null) + this._weakEventManager = new WeakEventManager(); + return this._weakEventManager; + } + } /// /// Proxy around this.weakEventManager.BindWeak. Binds to an INotifyPropertyChanged source, in a way which doesn't cause us to be retained