Many different fixes

10 files changed, 20 insertions, 19 deletions

diff --git a/AboutBox.resx b/AboutBox.resx
index f14140af..dbdd75cd 100644
--- a/AboutBox.resx
+++ b/AboutBox.resx
@@ -604,7 +604,7 @@
     <value>Based on hakchi by madmonkey.

 

 Thanks: 

-madmonkey, pcm720, DanTheMan827, princess_daphie, skogaby for great help with everything.

+madmonkey, pcm720, DanTheMan827, princess_daphie, skogaby, honeylab, KMFDManic for great help with everything.

 xsnake for Japanese font.

 Pete Batard/Akeo for Zadig

 pbatard for libwdi.

@@ -618,7 +618,7 @@ Nintendo for my childhood.
 

 Translators:

 Jhynjhiruu Rekrap &lt;cub3r12@gmail.com&gt;

-Alex Marco Saternus &lt;alex.saternus@outlook.de&gt;

+Alex Marco Saternus &lt;utgardus@gmail.com&gt;

 Alexey Eberhardt &lt;tristamson@hotmail.com&gt;

 Condi - Konrad Płaszczykowski &lt;condiczek@gmail.com&gt;

 Miltos Arpazopoulos &lt;miltos.arpazopoulos@gmail.com&gt;

diff --git a/Apps/AppTypeCollection.cs b/Apps/AppTypeCollection.cs
index 3c87a9c6..a2a7166d 100644
--- a/Apps/AppTypeCollection.cs
+++ b/Apps/AppTypeCollection.cs
@@ -31,7 +31,7 @@ namespace com.clusterrr.hakchi_gui
             new AppInfo

             {

                 Class = typeof(NesUGame),

-                Extensions = new string[] {".unf", ".unif", ".nes", ".fds" },

+                Extensions = new string[] {".unf", ".unif", ".nes" },

                 DefaultApps = new string[] {"/bin/nes"},

                 Prefix = 'I',

                 DefaultCover = Resources.blank_jp

diff --git a/Apps/FdsGame.cs b/Apps/FdsGame.cs
index ed19e798..4045f667 100644
--- a/Apps/FdsGame.cs
+++ b/Apps/FdsGame.cs
@@ -23,7 +23,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 uint crc32)

+        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)

         {

             FindPatch(ref rawRomData, inputFileName, crc32);

             if (Encoding.ASCII.GetString(rawRomData, 0, 3) == "FDS") // header? cut it!

diff --git a/MainForm.cs b/MainForm.cs
index 3c72f0a3..130677e4 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -174,7 +174,7 @@ namespace com.clusterrr.hakchi_gui
             if (ConfigIni.TelnetServer)

                 Clovershell.ShellEnabled = shellToolStripMenuItem.Checked = true;

             alwaysWriteGamesToUSBDriveToolStripMenuItem.Checked = ConfigIni.AlwaysWriteToUSB;

-            buttonStart.Text = (Control.ModifierKeys == Keys.Shift) ^ ConfigIni.AlwaysWriteToUSB ? Resources.SyncronizeUSB : Resources.Syncronize;

+            buttonStart.Text = (Control.ModifierKeys == Keys.Shift) || ConfigIni.AlwaysWriteToUSB ? Resources.SyncronizeUSB : Resources.Syncronize;

         }

 

         void FormInitialize()

@@ -794,6 +794,7 @@ namespace com.clusterrr.hakchi_gui
         DialogResult RequirePatchedKernel()

         {

             if (ConfigIni.CustomFlashed) return DialogResult.OK; // OK - already flashed

+            if (Clovershell.IsOnline) return DialogResult.OK; // OK - maybe not flashed but it's online

             if (MessageBox.Show(Resources.CustomWarning, Resources.CustomKernel, MessageBoxButtons.YesNo, MessageBoxIcon.Warning)

                     == System.Windows.Forms.DialogResult.Yes)

             {

@@ -807,7 +808,7 @@ namespace com.clusterrr.hakchi_gui
 

         private void buttonStart_Click(object sender, EventArgs e)

         {

-            bool exportGames = (Control.ModifierKeys == Keys.Shift) ^ ConfigIni.AlwaysWriteToUSB;

+            bool exportGames = (Control.ModifierKeys == Keys.Shift) || ConfigIni.AlwaysWriteToUSB;

             SaveConfig();

 

             var stats = RecalculateSelectedGames();

@@ -1250,7 +1251,7 @@ namespace com.clusterrr.hakchi_gui
         private void alwaysWriteGamesToUSBDriveToolStripMenuItem_Click(object sender, EventArgs e)

         {

             ConfigIni.AlwaysWriteToUSB = alwaysWriteGamesToUSBDriveToolStripMenuItem.Checked;

-            buttonStart.Text = (Control.ModifierKeys == Keys.Shift) ^ ConfigIni.AlwaysWriteToUSB ? Resources.SyncronizeUSB : Resources.Syncronize;

+            buttonStart.Text = (Control.ModifierKeys == Keys.Shift) || ConfigIni.AlwaysWriteToUSB ? Resources.SyncronizeUSB : Resources.Syncronize;

         }

 

         private void selectButtonCombinationToolStripMenuItem_Click(object sender, EventArgs e)

@@ -1902,7 +1903,7 @@ namespace com.clusterrr.hakchi_gui
         private void MainForm_KeyDown(object sender, KeyEventArgs e)

         {

             if (e.KeyCode == Keys.ShiftKey)

-                buttonStart.Text = !ConfigIni.AlwaysWriteToUSB ? Resources.SyncronizeUSB : Resources.Syncronize;

+                buttonStart.Text = Resources.SyncronizeUSB;

             if (listViewGames.SelectedItems.Count != 1) return;

             var selected = listViewGames.SelectedItems[0].Tag;

             if ((e.KeyCode == Keys.E) && (e.Modifiers == (Keys.Alt | Keys.Control)) && (selected is SnesGame))

@@ -1920,7 +1921,7 @@ namespace com.clusterrr.hakchi_gui
 

         private void MainForm_Activated(object sender, EventArgs e)

         {

-            buttonStart.Text = (Control.ModifierKeys == Keys.Shift) ^ ConfigIni.AlwaysWriteToUSB ? Resources.SyncronizeUSB : Resources.Syncronize;

+            buttonStart.Text = (Control.ModifierKeys == Keys.Shift) || ConfigIni.AlwaysWriteToUSB ? Resources.SyncronizeUSB : Resources.Syncronize;

         }

 

         private void createCustomCommandToolStripMenuItem_Click(object sender, EventArgs e)

diff --git a/NesMenuCollection.cs b/NesMenuCollection.cs
index ef659ff7..0bcd40db 100644
--- a/NesMenuCollection.cs
+++ b/NesMenuCollection.cs
@@ -61,10 +61,10 @@ namespace com.clusterrr.hakchi_gui
             else

             {

                 root = new NesMenuCollection();

-                root.AddRange(this.Where(o => !(o is NesDefaultGame)));

+                root.AddRange(this.Where(o => !(o is NesDefaultGame || o.GetType() == typeof(NesMiniApplication))));

                 if (root.Count == 0)

                     return;

-                this.RemoveAll(o => !(o is NesDefaultGame));

+                this.RemoveAll(o => root.Contains(o));

                 this.Add(new NesMenuFolder()

                 {

                     Name = Resources.FolderNameMoreGames,

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 21c263b9..b6ee6612 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@ using System.Resources;
 // You can specify all the values or you can default the Build and Revision Numbers 

 // by using the '*' as shown below:

 // [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("2.0.30.1")]

-[assembly: AssemblyFileVersion("2.0.30.1")]

+[assembly: AssemblyVersion("2.0.30.2")]

+[assembly: AssemblyFileVersion("2.0.30.2")]

 [assembly: NeutralResourcesLanguageAttribute("en-US")]

diff --git a/WorkerForm.cs b/WorkerForm.cs
index 6a4adeeb..c05e364e 100644
--- a/WorkerForm.cs
+++ b/WorkerForm.cs
@@ -491,7 +491,7 @@ namespace com.clusterrr.hakchi_gui
                 if (matchedKeys.Count() > 0)

                 {

                     if (!matchedKeys.Contains(ConfigIni.ConsoleType))

-                        throw new Exception(Resources.InvalidConsoleSelected + " " + matchedKernels.First());

+                        throw new Exception(Resources.InvalidConsoleSelected + " " + matchedKeys.First());

                 }

                 else throw new Exception("Unknown key, unknown console");

 

diff --git a/hakchi_gui.csproj b/hakchi_gui.csproj
index 044396be..0678daae 100644
--- a/hakchi_gui.csproj
+++ b/hakchi_gui.csproj
@@ -31,8 +31,8 @@
     <PublisherName>Alexey %27Cluster%27 Avdyukhin</PublisherName>

     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>

     <WebPage>index.html</WebPage>

-    <ApplicationRevision>1</ApplicationRevision>

-    <ApplicationVersion>2.0.30.1</ApplicationVersion>

+    <ApplicationRevision>10</ApplicationRevision>

+    <ApplicationVersion>2.0.30.10</ApplicationVersion>

     <UseApplicationTrust>false</UseApplicationTrust>

     <CreateDesktopShortcut>true</CreateDesktopShortcut>

     <PublishWizardCompleted>true</PublishWizardCompleted>

diff --git a/mods/mod_hakchi/hakchi/config b/mods/mod_hakchi/hakchi/config
index 6cefdfe6..25b58761 100644
--- a/mods/mod_hakchi/hakchi/config
+++ b/mods/mod_hakchi/hakchi/config
@@ -1,4 +1,4 @@
 export cf_backup_dummy='n'
 export cf_backup='n'
 export cf_backup_nandc='n'
-export cf_shutdown='r'
+export cf_shutdown='n'
diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0010_functions b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0010_functions
index ec568dc8..1e670812 100644
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0010_functions
+++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0010_functions
@@ -254,8 +254,8 @@ softwareCheck(){
 repair_fonts(){
   if [ "$sftype" == "nes" ]; then
     mkdir -p "$1" || return 1
-    [ ! -f "$1/title.fnt" ] && (copy "$rootfs$gamepath/title.fnt" "$1/" || copy "$squashfs$gamepath/title.fnt" "$1/")
-    [ ! -f "$1/copyright.fnt" ] && (copy "$rootfs$gamepath/copyright.fnt" "$1/" || copy "$squashfs$gamepath/copyright.fnt" "$1/")
+    copy "$rootfs$gamepath/title.fnt" "$1/" || copy "$squashfs$gamepath/title.fnt" "$1/"
+    copy "$rootfs$gamepath/copyright.fnt" "$1/" || copy "$squashfs$gamepath/copyright.fnt" "$1/"
   fi
 }