# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1327164667 0
# Node ID ea5cb50ebe5ee96ad64f9651d20b7e427424ff6d
# Parent  dd893a582184c8e016e954f89e2bb11013df9af3
Fixes #384: Validation warnings don't get cleared when creating new armies
 * Check whether army is valid when it changes (also means we validate on load as well as clearing on close)

diff -r dd893a582184 -r ea5cb50ebe5e FrmMain.cs
--- a/FrmMain.cs	Sat Jan 21 16:34:18 2012 +0000
+++ b/FrmMain.cs	Sat Jan 21 16:51:07 2012 +0000
@@ -915,6 +915,7 @@
 		private void FrmMain_ArmyChanged(Army oldArmy, Army newArmy)
 		{
 			CommandStack.Reset();
+			ValidateArmy();
 			loadedFilePath = null;
 			miSaveArmy.Enabled = false;
 			bttnSaveArmy.Enabled = false;
@@ -1251,7 +1252,7 @@
         private void ValidateArmy()
         {
             ICollection<string> failureMessages;
-            if (Validates.AsOkay(RequirementHandler.ValidateArmy(CurrentArmy, out failureMessages)))
+            if (CurrentArmy == null || Validates.AsOkay(RequirementHandler.ValidateArmy(CurrentArmy, out failureMessages)))
             {
                 sbErrorPanel.Text = "";
                 sbErrorPanel.Tag = "";