/[EmuXPortal]/trunk/EmuXPortal/Api/RomParser.cs
ViewVC logotype

Diff of /trunk/EmuXPortal/Api/RomParser.cs

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/EmuXPortal/Api/RomParser.cs	2014/08/04 11:35:06	199
+++ trunk/EmuXPortal/Api/RomParser.cs	2014/08/04 12:39:13	200
@@ -79,25 +79,13 @@
         {
             string PlatformNameShort = child_config.PlatformNameShort.Contains("Unknown") ? parent_config.PlatformNameShort != "" ? parent_config.PlatformNameShort : "" : child_config.PlatformNameShort;
             string PlatformNameLong = child_config.PlatformNameLong.Contains("Unknown") ? parent_config.PlatformNameLong != "" ? parent_config.PlatformNameLong : "" : child_config.PlatformNameLong;
-            string PlatformImage = child_config.GameImage == "" ? parent_config.GameImage != "" ? parent_config.GameImage : "" : child_config.GameImage;
+            string PlatformImage = "";
             string Extenstions = child_config.Extenstions == "" ? parent_config.Extenstions != "" ? parent_config.Extenstions : "" : child_config.Extenstions;
             string EmuPath = child_config.EmuPath == "" ? parent_config.EmuPath != "" ? parent_config.EmuPath : "" : child_config.EmuPath;
             string EmuOptions = child_config.EmuOptions == "" ? parent_config.EmuOptions != "" ? parent_config.EmuOptions : "" : child_config.EmuOptions;
 
-            FileInfo fi = new FileInfo(PlatformImage);
-            if (!fi.Exists)
-            {
-                PlatformImage = string.Format(@"{0}\{1}", new FileInfo(child_config.GameExe).Directory.FullName, PlatformImage);
-                fi = new FileInfo(PlatformImage);
-                if (!fi.Exists)
-                {
-                    PlatformImage = string.Format(@"{0}\{1}", new FileInfo(parent_config.EmuRomPath).Directory.FullName, PlatformImage);
-                    fi = new FileInfo(PlatformImage);
-                    if (!fi.Exists) { PlatformImage = ""; }
-                }
-            }
-            fi = null;
 
+            
             EmuXPortal.Api.EmuConfigLoader.EmuConfig c = new EmuConfigLoader.EmuConfig(log, 
                 PlatformNameShort, PlatformNameLong, PlatformImage,
                 Extenstions, EmuPath, EmuOptions);
@@ -109,6 +97,7 @@
             c.GameImage = child_config.GameImage;
             c.GameTitle = child_config.GameTitle;
             c.ConfigPath = child_config.ConfigPath;
+            c.GameImage = child_config.GameImage;
             return c;
         }
         private List<IRomConfig> GenerateRomConfig(logger log, List<IRomConfigPair> roms, IEmuConfig config)

 

  ViewVC Help
Powered by ViewVC 1.1.22