From e767e1b673f9480fa3d7b17ebc827501f7a851ea Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 1 Apr 2017 16:14:04 -0500
Subject: [PATCH] Fix loading roms from archive when using recent roms menu

---
 BizHawk.Common/Win32Hacks.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Common/Win32Hacks.cs b/BizHawk.Common/Win32Hacks.cs
index 419b7f722b..dc1c356c6a 100644
--- a/BizHawk.Common/Win32Hacks.cs
+++ b/BizHawk.Common/Win32Hacks.cs
@@ -168,8 +168,16 @@ namespace BizHawk.Common
 		//http://stackoverflow.com/questions/139010/how-to-resolve-a-lnk-in-c-sharp
 		public static string ResolveShortcut(string filename)
 		{
-			if (Path.GetExtension(filename).ToLowerInvariant() != ".lnk")
+			// archive internal files are never shortcuts (and choke when analyzing any further)
+			if (filename.Contains("|"))
+			{
 				return filename;
+			}
+
+			if (Path.GetExtension(filename).ToLowerInvariant() != ".lnk")
+			{
+				return filename;
+			}
 
 			PInvokes.ShellLink link = new PInvokes.ShellLink();
 			((PInvokes.IPersistFile)link).Load(filename, PInvokes.STGM_READ);