Merged branch develop into master

amatukaze · Jul 14, 2016 · c8b461f · c8b461f
2 parents 602418c + 8ff3348
commit c8b461f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/HeavenlyWind.Base/ProductInfo.cs b/HeavenlyWind.Base/ProductInfo.cs
@@ -5,7 +5,7 @@ public static class ProductInfo
         public const string AppName = "いんてりじぇんと連装砲くん";
         public const string ProductName = "Intelligent Naval Gun";
 
-        public const string AssemblyVersionString = "0.1.11";
+        public const string AssemblyVersionString = "0.1.11.1";
 
         public static string Version => AssemblyVersionString;
         public static string ReleaseCodeName => "Kraken";

diff --git a/HeavenlyWind/App.xaml.cs b/HeavenlyWind/App.xaml.cs
@@ -75,6 +75,8 @@ protected override void OnStartup(StartupEventArgs e)
 
             PluginService.Instance.Initialize();
 
+            KanColleProxy.Start();
+
             ShutdownMode = ShutdownMode.OnMainWindowClose;
 
             Task.Factory.StartNew(UpdateService.Instance.CheckForUpdate);

diff --git a/HeavenlyWind/ViewModels/MainWindowViewModel.cs b/HeavenlyWind/ViewModels/MainWindowViewModel.cs
@@ -55,8 +55,8 @@ internal set
 
         internal MainWindowViewModel()
         {
-            r_Page = new InitializationPageViewModel(this);
             GameInformation = new GameInformationViewModel(this);
+            r_Page = GameInformation;
 
             SessionService.Instance.SubscribeOnce("api_start2", delegate
             {

diff --git a/HeavenlyWind/Views/MainWindow.xaml.cs b/HeavenlyWind/Views/MainWindow.xaml.cs
@@ -35,13 +35,6 @@ protected override void OnSourceInitialized(EventArgs e)
             PanicKeyService.Instance.Initialize(rHandle);
         }
 
-        protected override void OnContentRendered(EventArgs e)
-        {
-            base.OnContentRendered(e);
-
-            ((InitializationPageViewModel)App.Root.Page).Start();
-        }
-
         protected override void OnClosing(CancelEventArgs e)
         {
             var rDialog = new TaskDialog()