Merged branch develop into master

amatukaze · May 28, 2016 · 3b0f5d2 · 3b0f5d2
2 parents e5120a7 + bb9a79f
commit 3b0f5d2
Show file tree

Hide file tree

Showing 5 changed files with 142 additions and 139 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.10.1";
+        public const string AssemblyVersionString = "0.1.10.2";
 
         public static string Version => AssemblyVersionString;
         public static string ReleaseCodeName => "Tiramisu";

diff --git a/HeavenlyWind.Game/Services/Records/BattleDetailRecords.cs b/HeavenlyWind.Game/Services/Records/BattleDetailRecords.cs
@@ -180,11 +180,11 @@ protected override void UpgradeFromOldVersion(int rpOldVersion)
         byte[] CompressJson(JToken rpJsonToken)
         {
             using (var rMemoryStream = new MemoryStream())
-            using (var rCompressStream = new DeflateStream(rMemoryStream, CompressionMode.Compress))
-            using (var rStreamWriter = new StreamWriter(rCompressStream))
-            using (var rJsonTextWriter = new JsonTextWriter(rStreamWriter))
             {
-                rpJsonToken.WriteTo(rJsonTextWriter);
+                using (var rCompressStream = new DeflateStream(rMemoryStream, CompressionMode.Compress))
+                using (var rStreamWriter = new StreamWriter(rCompressStream))
+                using (var rJsonTextWriter = new JsonTextWriter(rStreamWriter))
+                    rpJsonToken.WriteTo(rJsonTextWriter);
 
                 return rMemoryStream.ToArray();
             }

diff --git a/HeavenlyWind/Services/Browser/BrowserWrapper.cs b/HeavenlyWind/Services/Browser/BrowserWrapper.cs
@@ -14,6 +14,7 @@
 using System.Reflection;
 using System.Threading;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
 
@@ -58,6 +59,11 @@ static BrowserWrapper()
         public BrowserWrapper(string rpLayoutEngine, int rpHostProcessID)
         {
             r_Container = new ContentControl();
+            r_Container.PreviewKeyDown += (_, e) =>
+            {
+                if (e.Key == Key.System)
+                    e.Handled = true;
+            };
 
             InitializeCommunicator(rpHostProcessID);