Merge pull request Necrobot-Private#47 from TheUnnamedOrganisation/ma…

…ster v2.7.0.19
Furtif · Mar 6, 2017 · 2d39dc5 · 2d39dc5
2 parents 8f5388f + 2137c74
commit 2d39dc5
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 16 deletions.
diff --git a/FeroxRev b/FeroxRev
diff --git a/POGOProtos b/POGOProtos
diff --git a/PoGo.NecroBot.Logic b/PoGo.NecroBot.Logic
diff --git a/RocketBot2/Forms/MainForm.cs b/RocketBot2/Forms/MainForm.cs
@@ -513,6 +513,23 @@ private void InitializeBot(Action<ISession, StatisticsAggregator> onBotStarted)
             _machine = machine;
             _settings = settings;
             _excelConfigAllow = excelConfigAllow;
+
+            if (accountManager.Accounts.Count > 1)
+            {
+                foreach (var item in accountManager.Accounts)
+                {
+                    var _item = new ToolStripMenuItem();
+                    _item.Text = item.Username;
+                    _item.Click += delegate
+                    {
+                        accountManager.SwitchAccountTo(item);
+                        _session.ReInitSessionWithNextBot(item);
+                    };
+                    accountsToolStripMenuItem.DropDownItems.Add(_item);
+                }
+            }
+            else
+            {  menuStrip1.Items.Remove(accountsToolStripMenuItem); }
         }
 
         private async Task StartBot()
@@ -816,6 +833,7 @@ private void startStopBotToolStripMenuItem_Click(object sender, EventArgs e)
                 return;
             }
             startStopBotToolStripMenuItem.Text = @"■ Exit RocketBot2";
+            accountsToolStripMenuItem.Enabled = false;
             _botStarted = true;
             btnRefresh.Enabled = true;
             Task.Run(StartBot);
@@ -1108,7 +1126,7 @@ public async void NicknamePokemon(IEnumerable<PokemonData> pokemons, string nick
                     }
                     continue;
                 }
-                await RenameSinglePokemonTask.Execute(_session, pokemon.Id, nickname,_session.CancellationTokenSource.Token);
+                await RenameSinglePokemonTask.Execute(_session, pokemon.Id, nickname, _session.CancellationTokenSource.Token);
             }
             await ReloadPokemonList();
         }

diff --git a/RocketBot2/Forms/MainForm.designer.cs b/RocketBot2/Forms/MainForm.designer.cs
diff --git a/RocketBot2/Properties/AssemblyInfo.cs b/RocketBot2/Properties/AssemblyInfo.cs
@@ -37,8 +37,8 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.7.0.17")]
+// [assembly: AssemblyVersion("2.7.0.19")]
 
-[assembly: AssemblyVersion("2.7.0.17")]
+[assembly: AssemblyVersion("2.7.0.19")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("v2.7.0.17")]
+[assembly: AssemblyInformationalVersion("v2.7.0.19")]
diff --git a/RocketBot2/RocketBot2.csproj b/RocketBot2/RocketBot2.csproj
@@ -493,15 +493,15 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\POGOProtos\POGOProtos.csproj">
+    <ProjectReference Include="$(SolutionDir)\POGOProtos\POGOProtos.csproj">
       <Project>{a03a7bb2-4f0b-467b-84b2-9a76e6aae6fb}</Project>
       <Name>POGOProtos</Name>
     </ProjectReference>
-    <ProjectReference Include="..\FeroxRev\PokemonGo.RocketAPI.csproj">
+    <ProjectReference Include="$(SolutionDir)\FeroxRev\PokemonGo.RocketAPI.csproj">
       <Project>{05d2da44-1b8e-4cf7-94ed-4d52451cd095}</Project>
       <Name>PokemonGo.RocketAPI</Name>
     </ProjectReference>
-    <ProjectReference Include="..\PoGo.NecroBot.Logic\PoGo.NecroBot.Logic.csproj">
+    <ProjectReference Include="$(SolutionDir)\PoGo.NecroBot.Logic\PoGo.NecroBot.Logic.csproj">
       <Project>{0739e40d-c589-4aeb-93e5-ee8cd6773c60}</Project>
       <Name>PoGo.NecroBot.Logic</Name>
     </ProjectReference>