From f1e609c6ffe098df1980394050e390a4913a7215 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 6 Nov 2013 20:55:00 -0700
Subject: [PATCH] Allow embedded exe files to be discovered in installer

---
 Installer/App.xaml.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Installer/App.xaml.cs b/Installer/App.xaml.cs
index e95d1c9..c7749db 100644
--- a/Installer/App.xaml.cs
+++ b/Installer/App.xaml.cs
@@ -41,6 +41,13 @@ static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs ar
                 path = String.Format(@"{0}\{1}", assemblyName.CultureInfo, path);
 
             var stream = GetEmbeddedResource(path);
+            if (stream == null)
+            {
+                path = assemblyName.Name + ".exe";
+                if (assemblyName.CultureInfo.Equals(CultureInfo.InvariantCulture) == false)
+                    path = String.Format(@"{0}\{1}", assemblyName.CultureInfo, path);
+                stream = GetEmbeddedResource(path);
+            }
             if (stream == null)
                 return null;