* crash & other minor fixes

derplayer · Sep 4, 2018 · 278cecb · 278cecb
1 parent 1f0a020
commit 278cecb
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 14 deletions.
diff --git a/Project/About.Designer.cs b/Project/About.Designer.cs
diff --git a/Project/About.cs b/Project/About.cs
@@ -116,5 +116,10 @@ private void vmuBox_Click(object sender, EventArgs e)
             this.vmuBox.Image = null;
             this.vmuBox.Image = Resources.gfx[random.Next(0, Resources.gfx.Count)];
         }
+
+        private void urlLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://github.com/derplayer/ShenmueHDTools");
+        }
     }
 }
diff --git a/Project/Form1.Designer.cs b/Project/Form1.Designer.cs
diff --git a/Project/Form1.cs b/Project/Form1.cs
@@ -199,6 +199,7 @@ private void MainWindow_Load(object sender, EventArgs e)
             listViewMain.AllowDrop = true;
             listViewMain.DragDrop += new DragEventHandler(listViewMain_DragDrop);
             listViewMain.DragEnter += new DragEventHandler(listViewMain_DragEnter);
+            listViewColumnSorter = new ListViewColumnSorterExt(listViewMain);
         }
 
         void listViewMain_DragEnter(object sender, DragEventArgs e)
@@ -374,6 +375,8 @@ public int Compare(object x, object y)
             listviewX = (ListViewItem)x;
             listviewY = (ListViewItem)y;
 
+            if (listviewY.Text == "") return 0; //dirty bugfix for an bigfix
+
             // Compare the two items
             compareResult = ObjectCompare.Compare(listviewX.SubItems[ColumnToSort].Text, listviewY.SubItems[ColumnToSort].Text);
 

diff --git a/Project/Loading.Designer.cs b/Project/Loading.Designer.cs
diff --git a/Project/Loading.cs b/Project/Loading.cs
@@ -17,6 +17,14 @@ public partial class Loading : Form
         public Loading()
         {
             InitializeComponent();
+            try
+            {
+                ShowDialog();
+            }
+            catch (Exception e)
+            {
+
+            }
         }
 
         private void Loading_Load(object sender, EventArgs e)

diff --git a/Project/Main/Core.cs b/Project/Main/Core.cs
@@ -144,8 +144,8 @@ public void Export()
                     {
                         LockGUI();
                         data.Export(newSavePathDlg.FileName);
-                        Program.MainWindowCore.toolStripStatusLabel1.Text = "Export executed!";
                         UnlockGUI();
+                        Program.MainWindowCore.toolStripStatusLabel1.Text = "Export executed!";
                     }
                 }
                 else
@@ -173,15 +173,30 @@ public void UpdateGUI()
 
         public void LockGUI()
         {
-            loadingThread = new Thread(() => new Loading().ShowDialog());
-            Program.MainWindowCore.Hide();
-            loadingThread.Start();
+            try
+            {
+                loadingThread = new Thread(() => new Loading());
+                Program.MainWindowCore.Hide();
+                loadingThread.Start();
+            }
+            catch (Exception)
+            {
+                Program.MainWindowCore.Hide();
+            }
         }
 
         public void UnlockGUI()
         {
-            loadingThread.Abort();
-            Program.MainWindowCore.Show();
+            try
+            {
+                loadingThread.Abort();
+                Program.MainWindowCore.Show();
+            }
+            catch (Exception)
+            {
+                Program.MainWindowCore.Show();
+            }
+
         }
     }
 }
diff --git a/Project/Main/DataLogic.cs b/Project/Main/DataLogic.cs
@@ -179,7 +179,10 @@ public List<FileStructure> LoadCache(string path, string directory)
             catch (Exception e)
             {
                 System.Diagnostics.Debug.WriteLine("Something broke..." + e);
-                MessageBox.Show("The shdcahe was created with an older verison that in incompatible! Please create a new project and try again!");
+                MessageBox.Show("The loaded shdcahe was created with an older verison of ModTools, that is incompatible now!\n\n" +
+                    "Please copy your modified files, create a new project and copy those over and try again!\n\n" +
+                    "Remember: The fileextensions are also now changed (fewer unknowns)\n"
+                    );
             }
 
             UpdateGUI();
@@ -347,7 +350,7 @@ public void Export(string path)
             if (newFiles.Count <= 0)
             {
                 MessageBox.Show("No files were modified! Export stopped!");
-
+                UpdateGUI();
                 return;
             }