From dca65b2c83fd8376fc0b20cfb794edb74c96c0a8 Mon Sep 17 00:00:00 2001
From: Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com>
Date: Thu, 22 Feb 2018 16:15:54 +0300
Subject: Fixes, fixes, fixes

---
 MainForm.cs                                                 | 2 ++
 Properties/AssemblyInfo.cs                                  | 4 ++--
 WorkerForm.cs                                               | 2 +-
 mods/mod_hakchi/hakchi/rootfs/etc/preinit                   | 2 +-
 mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0010_functions | 7 ++++---
 mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0040_usb       | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/MainForm.cs b/MainForm.cs
index 48b74a12..3f81a305 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -1902,6 +1902,8 @@ namespace com.clusterrr.hakchi_gui
                 item.Tag = newApp;
                 item.Selected = true;
                 item.Checked = true;
+                foreach (ListViewItem i in listViewGames.Items)
+                    i.Selected = false;
                 listViewGames.Items.Add(item);
                 // Schedule recalculation
                 timerCalculateGames.Enabled = false;
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index fb184739..d292a358 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.4")]
-[assembly: AssemblyFileVersion("2.0.30.4")]
+[assembly: AssemblyVersion("2.0.30.5")]
+[assembly: AssemblyFileVersion("2.0.30.5")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/WorkerForm.cs b/WorkerForm.cs
index c12a7282..db01067d 100644
--- a/WorkerForm.cs
+++ b/WorkerForm.cs
@@ -971,7 +971,7 @@ namespace com.clusterrr.hakchi_gui
                                     {
                                         try
                                         {
-                                            pos += NesMiniApplication.DirectorySize(Path.Combine(Path.Combine(tempGamesDirectory, ".."), line.Replace("/", "\\")));
+                                            pos += NesMiniApplication.DirectorySize(Path.Combine(Path.Combine(tempGamesDirectory, ".."), lastDirectory.Replace("/", "\\")));
                                             progress = (int)(startProgress + pos / 1024 / 1024);
                                             SetProgress(progress, maxProgress);
                                         }
diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit b/mods/mod_hakchi/hakchi/rootfs/etc/preinit
index 5b9959bb..6db9971c 100644
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit
+++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit
@@ -55,6 +55,6 @@ script_init(){
 
 preinit(){
   source_base
-  mount_base
+  mountSquash # for backward compatibility
   source_parts "$preinit.d/p????_*"
 }
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 1e670812..b29eda8c 100644
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0010_functions
+++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0010_functions
@@ -253,9 +253,9 @@ softwareCheck(){
 
 repair_fonts(){
   if [ "$sftype" == "nes" ]; then
-    mkdir -p "$1" || return 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/"
+    mkdir -p "$1" || return 1    
+    ( [ $cfg_fontfix_enabled == "y" ] && copy "$rootfs/usr/share/fonts/title.fnt" "$1/" ) || copy "$rootfs$gamepath/title.fnt" "$1/" || copy "$squashfs$gamepath/title.fnt" "$1/"
+    copy "$squashfs$gamepath/copyright.fnt" "$1/"
   fi
 }
 
@@ -263,6 +263,7 @@ repair_games(){
   [ -w "$1" ] || return 0
   [ -f "$1/.repair.flag" ] || return 0
   cat "$rootfs/etc/pleasewait.fb" | gunzip -c - > "/dev/fb0"
+  echo repairing games...
   local usesymlink=''
   ln -s / "$1/symlinktest" 2>/dev/null && rm -f "$1/symlinktest" && usesymlink='y'
 
diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0040_usb b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0040_usb
index 6a5d60ca..5f1ce6ad 100644
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0040_usb
+++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0040_usb
@@ -65,7 +65,7 @@ checkStorageDevice(){
   fi
 
   local need_repair=""
-  [ -d "$mountpoint/media/$games" ] && ! [ -z "$(find $mountpoint/media/$games -name .repair.flag -maxdepth 2)" ] && need_repair=y
+  [ -d "$mountpoint/media/$modname/games" ] && ! [ -z "$(find $mountpoint/media/$modname/games -name .repair.flag -maxdepth 2)" ] && need_repair=y
 
   if [ -d "$mountpoint/media/$saves" ] || [ -d "$mountpoint/media/$modname/transfer" ] || [ "$cfg_usb_rw" == "y" ] || [ "$need_repair" == "y" ]; then
     umount "$mountpoint/media" 2>/dev/null
-- 
cgit v1.2.3