pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-23 16:21:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[CLI] Console menu validation fixes (#3413)

Browse Source
This commit is contained in:
Chris Miles 2023-06-17 18:19:55 -05:00 committed by GitHub
parent 53563b9720
commit 3200145d01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/cli/eqemu_command_handler.cpp
View File

@ -77,7 +77,7 @@ namespace EQEmuCommand {
index++; index++;
} }
if (!arguments_filled || argc == 2 || cmd[{"-h", "--help"}]) { if (!arguments_filled || (argc == 2 && !cmd[{"-h", "--help"}]) || (argc == 3 && cmd[{"-h", "--help"}])) {
std::string arguments_string; std::string arguments_string;
for (auto &arg : arguments) { for (auto &arg : arguments) {
arguments_string += " " + arg; arguments_string += " " + arg;

4
world/cli/database_dump.cpp
View File

@ -23,12 +23,12 @@ void WorldserverCLI::DatabaseDump(int argc, char **argv, argh::parser &cmd, std:
"--compress" "--compress"
}; };
EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
if (cmd[{"-h", "--help"}]) { if (cmd[{"-h", "--help"}]) {
return; return;
} }
EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
auto s = new DatabaseDumpService(); auto s = new DatabaseDumpService();
bool dump_all = cmd[{"-a", "--all"}]; bool dump_all = cmd[{"-a", "--all"}];