Merge branch 'main' into digital-patching

# Conflicts: # Refresher/Program.cs # Refresher/UI/ConsolePatchForm.cs
LittleBigRefresh · Jan 17, 2024 · 7dfac79 · 7dfac79
2 parents 4d96518 + e5d3569
commit 7dfac79
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/Refresher/Program.cs b/Refresher/Program.cs
@@ -26,10 +26,13 @@ public static void Main(string[] args)
             App = new Application();
             App.UnhandledException += (sender, eventArgs)
                 => MessageBox.Show($"""
-                                    There was an unhandled error in Refresher!
-                                    *Please* screenshot this message box and send it to us over GitHub or Discord with details on what you were doing. This is likely a bug in Refresher.
+                                    Unhandled error!
+                                    PLEASE
+                                    PLEASE
+                                    PLEASE
+                                    Send this message box to us with details! This is never intentional, you should never see this!
                                     
-                                    Exception details: {eventArgs.ExceptionObject}
+                                    {eventArgs.ExceptionObject}
                                     """,
                     "Critical Error!");
 

diff --git a/Refresher/UI/ConsolePatchForm.cs b/Refresher/UI/ConsolePatchForm.cs
@@ -15,7 +15,7 @@ protected override void PathChanged(object? sender, EventArgs ev)
     {
         if (this._remoteAddress.Text.Trim().Length == 0)
         {
-            MessageBox.Show("Please enter a valid IP address. You can usually see this listed under Network settings on your PS3.", "Error");
+            MessageBox.Show("Please input a valid IP!", "Error");
             return;
         }
 
@@ -58,17 +58,17 @@ private bool InitializePatchAccessor()
         }
         catch(TimeoutException)
         {
-            MessageBox.Show($"The FTP connection timed out while we were waiting for a response from the PS3.\nAre you sure the webMAN FTP server is running?", "Error");
+            MessageBox.Show($"Timed out waiting for response from PS3...\nAre you sure the webMAN FTP server is running?", "Error!");
             return false;
         }
         catch(UriFormatException)
         {
-            MessageBox.Show($"The IP address was unable to be parsed. Are you sure you typed it in correctly?", "Error");
+            MessageBox.Show($"Unable to parse IP, make sure you typed it in correctly!", "Error!");
             return false; 
         }
         catch(Exception ex)
         {
-            MessageBox.Show($"An unknown error occurred while connecting to the PS3.\n\nException details: {ex}", "Error");
+            MessageBox.Show($"Unknown error failed while connecting to PS3...\nAre you sure the IP is correct?\n\n{ex}", "Error!");
             return false;
         }