From 6fb5029f7da29e148d7e47f1ec09c6ea08011d82 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sat, 11 Jan 2025 00:27:22 +0100
Subject: [PATCH] Frontend: Fix help cli-option.
Move check for "help" cli-option to beginning to not fail when none of "input" and "launch_menu" are present.
---
source/gui-sdl/main.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/source/gui-sdl/main.cpp b/source/gui-sdl/main.cpp
index 0dda979..85e89fc 100644
--- a/source/gui-sdl/main.cpp
+++ b/source/gui-sdl/main.cpp
@@ -138,7 +138,10 @@ int main(int argc, char* argv[]) {
bpo::variables_map vm;
try {
bpo::store(bpo::command_line_parser(argc, argv).options(desc).positional(p).run(), vm);
-
+ if (vm.count("help")) {
+ std::cout << desc << std::endl;
+ return 0;
+ }
if (!vm.count("input") && !vm["launch_menu"].as<bool>())
throw bpo::required_option("input or launch_menu"); // TODO: Better string?
@@ -160,10 +163,7 @@ int main(int argc, char* argv[]) {
return 1;
}
- if (vm.count("help")) {
- std::cout << desc << std::endl;
- return 0;
- }
+
// Prefer XDG_DATA_DIRS, then /usr/local/share, then /usr/share
auto xdg_data_dirs = getenv("XDG_DATA_DIRS");