v1.2.11.2

SaxoniteCoreWebAdmin/Admin/App/SaxApplication_Admin.cs

@@ -49,30 +49,45 @@ namespace Saxonite.Net.Core.Web.Admin.App
 			try
 			{
 				AppInstance = this;
-				SaxGlobals.App = this;
-				SaxGlobals.System = (System_Web = new SaxSystem_Web());
 				Configuration = configuration;
-				ConsoleHelper_Web = new SaxConsoleHelper_WebAdmin(this);
+				ConsoleHelper_Admin = new SaxConsoleHelper_Admin(this);
 			}
 			catch (Exception exc)
 			{
 				SaLogger.Error(GetType().Name + ".CTR " + ExceptionUtil.GetErrorStateMessage(exc));
-				throw exc;
+				throw;
 			}
 		}
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing)
+			{
+				// Clear globals.
+				AppInstance = null;
+				// Console helper.
+				if (ConsoleHelper_Admin != null)
+					ConsoleHelper_Admin.Dispose();
+				ConsoleHelper_Admin = null;
+			}
+			base.Dispose(disposing);
+		}
 
 		//-------------------------------------------------------------------
 		// Properties.
 		public static SaxApplication_Admin AppInstance { get; private set; }
-		public List<String> Messages { get; } = new List<String>();
+		public override SaxConsoleHelper ConsoleHelper { get { return ConsoleHelper_Admin; } }
+		public SaxConsoleHelper_Admin ConsoleHelper_Admin { get; private set; }
+		// Database.
 		public override ISacsDatabase GetDatabase(SaxSessionContext sessionContext, Sax.Database databaseType)
 		{
 			return sessionContexts.GetValue(sessionContext.Index, null)?.Databases.GetValue(databaseType, null);
 		}
-		public override String SessionCookieName { get { return Sax.Config.Admin.Session.Cookie.Name; } }
 		// Configuration.
 		public override SaxAppConfig AppConfig { get { return appConfigs.Values.ToList().getConfigForApplication(); } }
 		public override SaxEmailConfig EmailConfig { get { return emailConfigs.Values.ToList().getConfigForSession(AppConfig); } }
+		public override String SessionCookieName { get { return Sax.Config.Admin.Session.Cookie.Name; } }
+		// Startup messages - for debugging. See Admin.Views._Layout.
+		public List<String> Messages { get; } = new List<String>();
 
 		//-------------------------------------------------------------------
 		// Initialisation.