From 6c75d1dde30b34e1376b9f3ad8a9fdf06d085fa4 Mon Sep 17 00:00:00 2001
From: penev92 <penev92@gmail.com>
Date: Sat, 9 May 2015 18:10:01 +0300
Subject: [PATCH] Fix video playback to work with D2k VQAs

---
 OpenRA.Game/FileFormats/Format80.cs                   | 3 +++
 OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Game/FileFormats/Format80.cs b/OpenRA.Game/FileFormats/Format80.cs
index c1a3cd9a12..7706b199a9 100644
--- a/OpenRA.Game/FileFormats/Format80.cs
+++ b/OpenRA.Game/FileFormats/Format80.cs
@@ -74,6 +74,9 @@ namespace OpenRA.FileFormats
 					var count = ((i & 0x70) >> 4) + 3;
 					var rpos = ((i & 0xf) << 8) + secondByte;
 
+					if (destIndex + count > dest.Length)
+						return destIndex;
+
 					ReplicatePrevious(dest, destIndex, destIndex - rpos, count);
 					destIndex += count;
 				}
diff --git a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
index 93bd33fe37..8afcb6d4d6 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
@@ -304,7 +304,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			if (!GlobalFileSystem.Exists(filename))
 				return false;
 
-			if (Path.GetExtension(filename).ToLower() == ".vqa")
+			if (Path.GetExtension(filename.ToLowerInvariant()) == ".vqa")
 			{
 				player = panel.Get<VqaPlayerWidget>("PLAYER");
 				currentFilename = filename;