fix infinite loop in switch villageadd check before execute ToConstructionTab

Author: vinaghost

TbsCore/Helpers/VillageHelper.cs

@@ -88,32 +88,29 @@ public static Village VillageFromId(Account acc, int id)
 
         public static async Task SwitchVillage(Account acc, int id)
         {
-            do
+            try
             {
-                try
-                {
-                    acc.Wb.UpdateHtml();
-                    var node = acc.Wb.Html.DocumentNode.SelectSingleNode($"//div[@data-did='{id}']/a");
-                    if (node is null) return;
-
-                    var element = acc.Wb.Driver.FindElement(By.XPath($"//div[@data-did='{id}']/a"));
-                    element.Click();
-                    //dorf1.php?newdid=25270&
-                    await DriverHelper.WaitPageChange(acc, $"{id}", 0.2);
-                    return;
-                }
-                catch (WebDriverException e) when (e.Message.Contains("chrome not reachable") || e.Message.Contains("no such window:"))
-                {
-                    acc.Logger.Warning($"Chrome has problem. Try reopen Chrome");
+                acc.Wb.UpdateHtml();
+                var node = acc.Wb.Html.DocumentNode.SelectSingleNode($"//div[@data-did='{id}']/a");
+                if (node is null) return;
+
+                var element = acc.Wb.Driver.FindElement(By.XPath($"//div[@data-did='{id}']/a"));
+                element.Click();
+                //dorf1.php?newdid=25270&
+                await DriverHelper.WaitPageChange(acc, $"{id}", 0.2);
+                return;
+            }
+            catch (WebDriverException e) when (e.Message.Contains("chrome not reachable") || e.Message.Contains("no such window:"))
+            {
+                acc.Logger.Warning($"Chrome has problem. Try reopen Chrome");
 
-                    acc.Wb.Close();
-                    await acc.Wb.Init(acc);
-                }
-                catch // when waitpagechange timeout
-                {
-                    acc.Logger.Warning($"Cannot switch to village's id: {id}. Try again");
-                }
-            } while (true);
+                acc.Wb.Close();
+                await acc.Wb.Init(acc);
+            }
+            catch // when waitpagechange timeout
+            {
+                await DriverHelper.WaitPageLoaded(acc);
+            }
         }
 
         /// <summary>

TbsCore/Tasks/LowLevel/UpgradeBuilding.cs

@@ -75,7 +75,10 @@ public override async Task<TaskRes> Execute(Account acc)
                 }
 
                 await NavigationHelper.EnterBuilding(acc, Vill, (int)_buildingTask.BuildingId);
-                await NavigationHelper.ToConstructionTab(acc, _buildingTask.Building);
+                if (_buildingTask.ConstructNew)
+                {
+                    await NavigationHelper.ToConstructionTab(acc, _buildingTask.Building);
+                }
 
                 // find button to contruct/upgrade
                 bool construct;