Merge branch 'main' into user_and_settings

This commit is contained in:
georgemoralis
2025-12-01 11:17:21 +02:00
committed by GitHub
9 changed files with 130 additions and 0 deletions

View File

@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: Copyright 2025 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include <SDL3/SDL_messagebox.h>
#include "functional"
#include "iostream"
#include "string"
@@ -186,6 +187,10 @@ int main(int argc, char* argv[]) {
}}};
if (argc == 1) {
if (!SDL_ShowSimpleMessageBox(
SDL_MESSAGEBOX_INFORMATION, "shadPS4",
"This is a CLI application. Please use the QTLauncher for a GUI.", nullptr))
std::cerr << "Could not display SDL message box! Error: " << SDL_GetError() << "\n";
int dummy = 0; // one does not simply pass 0 directly
arg_map.at("-h")(dummy);
return -1;