diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index cdbc5c6ab..6666604bb 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -916,7 +916,7 @@ class PlayState extends MusicBeatSubState } // Display a popup. This blocks the application until the user clicks OK. - funkin.util.WindowUtil.showError(message, 'Error loading PlayState'); + funkin.util.WindowUtil.showError('Error loading PlayState', message); // Force the user back to the main menu. if (isSubState) diff --git a/source/funkin/play/cutscene/VideoCutscene.hx b/source/funkin/play/cutscene/VideoCutscene.hx index f59e5adbf..257f80cf6 100644 --- a/source/funkin/play/cutscene/VideoCutscene.hx +++ b/source/funkin/play/cutscene/VideoCutscene.hx @@ -66,7 +66,7 @@ class VideoCutscene if (!openfl.Assets.exists(filePath)) { // Display a popup. - // funkin.util.WindowUtil.showError('Video file does not exist: ${filePath}', 'Error playing video'); + // funkin.util.WindowUtil.showError('Error playing video', 'Video file does not exist: ${filePath}'); // return; // TODO: After moving videos to their own library, diff --git a/source/funkin/save/Save.hx b/source/funkin/save/Save.hx index 5235cc5a6..e9caec8ad 100644 --- a/source/funkin/save/Save.hx +++ b/source/funkin/save/Save.hx @@ -1220,7 +1220,7 @@ class Save { var msg = 'There was an error loading your save data in slot ${slot}.'; msg += '\nPlease report this issue to the developers.'; - funkin.util.WindowUtil.showError(msg, "Save Data Failure"); + funkin.util.WindowUtil.showError("Save Data Failure", msg); // Don't touch that slot anymore. // Instead, load the next available slot. @@ -1407,7 +1407,7 @@ class Save var msg = 'There was an error loading your save data from Newgrounds.'; msg += '\n${errorMsg}'; msg += '\nAre you sure you are connected to the internet?'; - funkin.util.WindowUtil.showError(msg, "Newgrounds Save Slot Failure"); + funkin.util.WindowUtil.showError("Newgrounds Save Slot Failure", msg); }); } #end diff --git a/source/funkin/save/migrator/SaveDataMigrator.hx b/source/funkin/save/migrator/SaveDataMigrator.hx index fcdcaa8cb..42b2d4657 100644 --- a/source/funkin/save/migrator/SaveDataMigrator.hx +++ b/source/funkin/save/migrator/SaveDataMigrator.hx @@ -41,7 +41,7 @@ class SaveDataMigrator var message:String = 'Error migrating save data, expected ${Save.SAVE_DATA_VERSION}.'; var slot:Int = Save.archiveBadSaveData(inputData); var fullMessage:String = 'An error occurred migrating your save data.\n${message}\nInvalid data has been moved to save slot ${slot}.'; - funkin.util.WindowUtil.showError(fullMessage, "Save Data Failure"); + funkin.util.WindowUtil.showError("Save Data Failure", fullMessage); return new Save(Save.getDefault()); } } diff --git a/source/funkin/util/logging/CrashHandler.hx b/source/funkin/util/logging/CrashHandler.hx index a3f19dd60..10d404a9a 100644 --- a/source/funkin/util/logging/CrashHandler.hx +++ b/source/funkin/util/logging/CrashHandler.hx @@ -109,7 +109,7 @@ class CrashHandler static function displayErrorMessage(message:String):Void { - funkin.util.WindowUtil.showError(message, "Fatal Uncaught Exception"); + funkin.util.WindowUtil.showError("Fatal Uncaught Exception", message); } #if sys