diff --git a/src/xenia/app/emulator_window.cc b/src/xenia/app/emulator_window.cc index fd47e6018..cfbc1fe3d 100644 --- a/src/xenia/app/emulator_window.cc +++ b/src/xenia/app/emulator_window.cc @@ -811,7 +811,11 @@ void EmulatorWindow::FileDrop(const std::filesystem::path& filename) { } auto result = emulator_->LaunchPath(filename); if (XFAILED(result)) { - // TODO: Display a message box. + xe::ui::ImGuiDialog::ShowMessageBox( + imgui_drawer_.get(), "Error: Failed to Launch", + fmt::format("Failed to launch target {}", + xe::path_to_utf8(filename.filename()) + + "; file format is unrecognized or corrupted.")); XELOGE("Failed to launch target: {:08X}", result); } } @@ -843,7 +847,11 @@ void EmulatorWindow::FileOpen() { auto abs_path = std::filesystem::absolute(path); auto result = emulator_->LaunchPath(abs_path); if (XFAILED(result)) { - // TODO: Display a message box. + xe::ui::ImGuiDialog::ShowMessageBox( + imgui_drawer_.get(), "Error: Failed to Launch", + fmt::format("Failed to launch target {}", + xe::path_to_utf8(abs_path.filename()) + + "; file format is unrecognized or corrupted.")); XELOGE("Failed to launch target: {:08X}", result); } } diff --git a/src/xenia/emulator.cc b/src/xenia/emulator.cc index cca28982f..607b42d5b 100644 --- a/src/xenia/emulator.cc +++ b/src/xenia/emulator.cc @@ -332,11 +332,11 @@ X_STATUS Emulator::LaunchDiscImage(const std::filesystem::path& path) { // Register the disc image in the virtual filesystem. auto device = std::make_unique(mount_path, path); if (!device->Initialize()) { - xe::FatalError("Unable to mount disc image; file not found or corrupt."); + XELOGE("Unable to mount disc image; file not found or corrupt."); return X_STATUS_NO_SUCH_FILE; } if (!file_system_->RegisterDevice(std::move(device))) { - xe::FatalError("Unable to register disc image."); + XELOGE("Unable to register disc image."); return X_STATUS_NO_SUCH_FILE; }