From d8c0e3b27e6b590268358e50b349f5947f68b57c Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Wed, 21 Mar 2012 06:38:19 +0000
Subject: [PATCH] make GetExeDirectoryAbsolute more robust (handle # in paths)

---
 BizHawk.MultiClient/BizHawk.MultiClient.csproj | 1 +
 BizHawk.MultiClient/config/PathManager.cs      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 551beea2c9..db782c2e2a 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -79,6 +79,7 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.DirectoryServices" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
diff --git a/BizHawk.MultiClient/config/PathManager.cs b/BizHawk.MultiClient/config/PathManager.cs
index 7646b53888..5c014d62fe 100644
--- a/BizHawk.MultiClient/config/PathManager.cs
+++ b/BizHawk.MultiClient/config/PathManager.cs
@@ -11,7 +11,8 @@ namespace BizHawk.MultiClient
 	{
 		public static string GetExeDirectoryAbsolute()
 		{
-			string module = new Uri(Assembly.GetEntryAssembly().GetName().CodeBase).LocalPath;
+			var uri = new Uri(Assembly.GetEntryAssembly().GetName().CodeBase);
+			string module = uri.LocalPath + System.Web.HttpUtility.UrlDecode(uri.Fragment);
 			return Path.GetDirectoryName(module);
 		}