Fix stack overflow on grabbing Dispatcher from ChildView

neilsarkar · Jul 30, 2020 · 9391e69 · 9391e69
1 parent d2c1377
commit 9391e69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Runtime/Navigation/VioletButton.cs b/Runtime/Navigation/VioletButton.cs
@@ -9,7 +9,7 @@ namespace VioletUI {
 	public class VioletButton : UnityEngine.UI.Button {
 		public ScreenId visitScreen;
 
-		Navigator navigator;
+		protected Navigator navigator;
 		protected override void Awake() {
 			base.Awake();
 			navigator = gameObject.GetComponentInParent<Navigator>();

diff --git a/Runtime/StateMonoBehaviour.cs b/Runtime/StateMonoBehaviour.cs
@@ -36,13 +36,13 @@ public class View : View<TState> {
 		public abstract class RepeatView<T> : RepeatView<TState, T> {
 			protected override TState State => Singleton?.State;
 			protected override TState LastState => Singleton?.LastState;
-			protected override Dispatcher<TState> Dispatcher => Dispatcher;
+			protected override Dispatcher<TState> Dispatcher => Singleton?.Dispatcher;
 		}
 
 		public abstract class ChildView<T> : ChildView<TState, T> {
 			protected override TState State => Singleton?.State;
 			protected override TState LastState => Singleton?.LastState;
-			protected override Dispatcher<TState> Dispatcher => Dispatcher;
+			protected override Dispatcher<TState> Dispatcher => Singleton?.Dispatcher;
 		}
 
 		void Awake() {