Mishap while handling the MM's reloading dialogs

Lisias · Lisias · commit 52ac9e3c03df · 2021-01-02T10:51:50.000-03:00
diff --git a/Source/ModuleManager/GUI/Menu.cs b/Source/ModuleManager/GUI/Menu.cs
@@ -40,7 +40,7 @@ internal void OnUpdate(bool inRnDCenter)
 			}
 		}
 
-		private void Show ()
+		private void Show()
 		{
 			this.instance = PopupDialog.SpawnPopupDialog(
 				new Vector2(0.5f, 0.5f),
diff --git a/Source/ModuleManager/GUI/ReloadingDatabase.cs b/Source/ModuleManager/GUI/ReloadingDatabase.cs
@@ -19,7 +19,7 @@ internal static ReloadingDatabaseDialog Show(ModuleManager parent)
 			return new ReloadingDatabaseDialog(parent);
 		}
 
-		internal Menu Dismiss()
+		internal ReloadingDatabaseDialog Dismiss()
 		{
 			this.instance.Dismiss();
 			this.instance = null;
diff --git a/Source/ModuleManager/ModuleManager.cs b/Source/ModuleManager/ModuleManager.cs
@@ -324,7 +324,7 @@ internal IEnumerator DataBaseReloadWithMM(bool dump = false)
 			finally
 			{
 				PerformanceMetrics.Instance.Stop();
-				reloadingDialog.Dismiss();
+				reloadingDialog = reloadingDialog.Dismiss();
 				Log("Total reloading Time = " + PerformanceMetrics.Instance.ElapsedTimeInSecs.ToString("F3") + "s");
 				PerformanceMetrics.Instance.Destroy();
 			}

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ internal void OnUpdate(bool inRnDCenter)`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- private void Show ()`
	`43`	`+ private void Show()`
`44`	`44`	`{`
`45`	`45`	`this.instance = PopupDialog.SpawnPopupDialog(`
`46`	`46`	`new Vector2(0.5f, 0.5f),`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ internal static ReloadingDatabaseDialog Show(ModuleManager parent)`
`19`	`19`	`return new ReloadingDatabaseDialog(parent);`
`20`	`20`	`}`
`21`	`21`
`22`		`- internal Menu Dismiss()`
	`22`	`+ internal ReloadingDatabaseDialog Dismiss()`
`23`	`23`	`{`
`24`	`24`	`this.instance.Dismiss();`
`25`	`25`	`this.instance = null;`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ internal IEnumerator DataBaseReloadWithMM(bool dump = false)`
`324`	`324`	`finally`
`325`	`325`	`{`
`326`	`326`	`PerformanceMetrics.Instance.Stop();`
`327`		`- reloadingDialog.Dismiss();`
	`327`	`+ reloadingDialog = reloadingDialog.Dismiss();`
`328`	`328`	`Log("Total reloading Time = " + PerformanceMetrics.Instance.ElapsedTimeInSecs.ToString("F3") + "s");`
`329`	`329`	`PerformanceMetrics.Instance.Destroy();`
`330`	`330`	`}`