- Fixed visual message box bug on C64

- Fixed string table formatting bug on Language Editor
- Some code cleanup, more clarification and reorganization
- Minor interface and language string cleanup also
- Fixed a few visual and stability anomalies in GUI
- Made it so that the program now cleans temp directory on opening

FriishProduce/FriishProduce.csproj

@@ -298,11 +298,11 @@
     <Compile Include="Subforms\Controllers\Controller_SNES.Designer.cs">
       <DependentUpon>Controller_SNES.cs</DependentUpon>
     </Compile>
-    <Compile Include="Subforms\HTMLForm.cs">
+    <Compile Include="Subforms\MessageBoxHTML.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Subforms\HTMLForm.Designer.cs">
-      <DependentUpon>HTMLForm.cs</DependentUpon>
+    <Compile Include="Subforms\MessageBoxHTML.Designer.cs">
+      <DependentUpon>MessageBoxHTML.cs</DependentUpon>
     </Compile>
     <Compile Include="Subforms\LanguageEditor.cs">
       <SubType>Form</SubType>
@@ -503,8 +503,8 @@
       <DependentUpon>Options_VC_SEGA.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Subforms\HTMLForm.resx">
-      <DependentUpon>HTMLForm.cs</DependentUpon>
+    <EmbeddedResource Include="Subforms\MessageBoxHTML.resx">
+      <DependentUpon>MessageBoxHTML.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Subforms\LanguageEditor.resx">
       <DependentUpon>LanguageEditor.cs</DependentUpon>

FriishProduce/MainForm.cs

@@ -194,7 +194,6 @@ public void UpdateConfig()
         public MainForm(string[] files = null)
         {
             InitializeComponent();
-            Program.Handle = Handle;
             this.files = files;
         }
 
@@ -973,7 +972,7 @@ private void ExtractWAD_Click(object sender, EventArgs e)
                 else
                 {
                     if (Program.DebugMode)
-                        throw (error);
+                        throw error;
                     else
                         MessageBox.Error(error.Message);
                 }

FriishProduce/Program.cs

@@ -14,8 +14,9 @@ static class Program
         public static Settings Config { get; set; }
         public static MainForm MainForm { get; private set; }
         public static Language Lang { get; set; }
-        public static IntPtr Handle { get; set; }
+
         public static bool DebugMode { get => Config?.application?.debug_mode ?? false; }
+        public static bool GUI { get => MainForm != null; }
 
         /// <summary>
         /// The main entry point for the application.
@@ -42,14 +43,12 @@ static void Main(string[] args)
                     }
             }
 
-            try
-            {
-            }
-            catch { }
+            // **********************************************************************************
 
             Config = new(Paths.Config);
             Logger.Log("Opening FriishProduce.");
             Lang = new Language();
+            CleanTemp();
 
             System.Threading.Thread.CurrentThread.CurrentUICulture = System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo(Lang.Current);
 
@@ -74,33 +73,25 @@ static void Main(string[] args)
         public static void CleanTemp()
         {
             if (!Directory.Exists(Paths.WorkingFolder)) Directory.CreateDirectory(Paths.WorkingFolder);
-
-            foreach (var item in Directory.GetFiles(Paths.WorkingFolder, "*.*", SearchOption.AllDirectories))
-                if (!Path.GetFileName(item).ToLower().Contains("readme.md"))
-                    try { File.Delete(item); } catch { }
-
-            foreach (var item in Directory.GetDirectories(Paths.WorkingFolder))
-                try { Directory.Delete(item, true); } catch { }
-
-            if (File.Exists(@"C:\1541 ROM") || File.Exists(@"C:\Basic ROM") || File.Exists(@"C:\Char ROM") || File.Exists(@"C:\Kernal ROM"))
+            else
             {
-                ProcessStartInfo info = new ProcessStartInfo()
-                {
-                    FileName = Paths.Tools + "frodosrc\\delete.bat",
-                    Verb = "runas",
-                    WindowStyle = ProcessWindowStyle.Minimized,
-                    CreateNoWindow = true,
-                    UseShellExecute = true,
-                    RedirectStandardInput = false
-                };
-
-                using (Process p = new())
+                string[] files = Directory.GetFiles(Paths.WorkingFolder, "*.*", SearchOption.AllDirectories);
+                string[] folders = Directory.GetDirectories(Paths.WorkingFolder);
+
+                if (files?.Length > 0 || folders?.Length > 0)
                 {
-                    p.StartInfo = info;
-                    p.Start();
-                    p.WaitForExit();
+                    Logger.Log("Cleaning temporary files.");
+
+                    foreach (var item in files)
+                        if (!Path.GetFileName(item).ToLower().Contains("readme.md"))
+                            try { File.Delete(item); } catch { }
+
+                    foreach (var item in folders)
+                        try { Directory.Delete(item, true); } catch { }
                 }
             }
+
+            Injectors.C64.Clean();
         }
     }