Release2.20

2 files changed, 12 insertions, 5 deletions

diff --git a/Apps/NesGame.cs b/Apps/NesGame.cs
index 52d533e5..b184c010 100644
--- a/Apps/NesGame.cs
+++ b/Apps/NesGame.cs
@@ -54,8 +54,7 @@ namespace com.clusterrr.hakchi_gui
         public static bool Patch(string inputFileName, ref byte[] rawRomData, ref char prefix, ref string application, ref string outputFileName, ref string args, ref Image cover, ref byte saveCount, ref uint crc32)

         {

             // Try to patch before mapper check, maybe it will patch mapper

-            FindPatch(ref rawRomData, inputFileName, crc32);

-

+            var patched = FindPatch(ref rawRomData, inputFileName, crc32);

             NesFile nesFile;

             try

             {

@@ -66,8 +65,15 @@ namespace com.clusterrr.hakchi_gui
                 application = "/bin/nes";

                 return true;

             }

-            nesFile.CorrectRom();

             crc32 = nesFile.CRC32;

+            // Also search for patch using internal CRC32

+            if (!patched)

+            {

+                if (FindPatch(ref rawRomData, inputFileName, crc32))

+                    nesFile = new NesFile(rawRomData);

+            }

+            nesFile.CorrectRom();

+

             if (ConfigIni.ConsoleType == MainForm.ConsoleType.NES || ConfigIni.ConsoleType == MainForm.ConsoleType.Famicom)

             {

                 application = "/bin/clover-kachikachi-wr";

diff --git a/Apps/SnesGame.cs b/Apps/SnesGame.cs
index 4eac1e42..8e8057cf 100644
--- a/Apps/SnesGame.cs
+++ b/Apps/SnesGame.cs
@@ -522,6 +522,7 @@ namespace com.clusterrr.hakchi_gui
                 if (ReleaseDate.Length == 7) ReleaseDate += "-01";

                 Publisher = gameinfo.Publisher.ToUpper();

 

+                /*

                 if (!string.IsNullOrEmpty(gameinfo.CoverUrl))

                 {

                     if (NeedAutoDownloadCover != true)

@@ -535,7 +536,7 @@ namespace com.clusterrr.hakchi_gui
                                 MessageBoxIcon.Question,

                                 MessageBoxDefaultButton.Button2, true);

                             if (r == DialogResult.Abort)

-                                NeedPatch = true;

+                                NeedAutoDownloadCover = true;

                             if (r == DialogResult.Ignore)

                                 return true;

                         }

@@ -552,7 +553,7 @@ namespace com.clusterrr.hakchi_gui
                         Debug.WriteLine(ex.Message + ex.StackTrace);

                     }

                 }

-

+                */

                 return true;

             }

             return false;