commit 1370f52f

sago007 · 2016-02-05 19:38
1370f52f20a936e13b4c7827d2bd73ec9128311d patch · browse files
parent 15b9c93b0b3d16e1454b6a46d0dd92a9ff042c09

Ensure that we still get the error message to stderr even if we open a message window

Changed files

M	source/code/main.cpp before

diff --git a/source/code/main.cpp b/source/code/main.cpp index 9c956f6..1015c57 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -1797,11 +1797,7 @@ int main(int argc, const char* argv[]) {

setlocale (LC_ALL, "");

bindtextdomain (PACKAGE, LOCALEDIR);

textdomain (PACKAGE);

- boost::program_options::options_description desc(

- SPrintStringF(_("Block Attack - Rise of the blocks %s\n"

- "%s\n\n"

- "Allowed options"), VERSION_NUMBER, "www.blockattack.net")

- );

+ boost::program_options::options_description desc("Allowed options");

desc.add_options()

("help,h", _("Displays this message"))

("nosound", _("Disables the sound. Can be used if sound errors prevents you from starting"))

@@ -1809,9 +1805,17 @@ int main(int argc, const char* argv[]) {

("verbose-basic", _("Enables basic verbose messages"))

;

boost::program_options::variables_map vm;

- boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm);

- boost::program_options::notify(vm);

+ try {

+ boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm);

+ boost::program_options::notify(vm);

+ } catch (exception& e) {

+ cerr << e.what() << endl;

+ cerr << desc << endl;

+ throw;

+ }

if (vm.count("help")) {

+ cout << SPrintStringF(_("Block Attack - Rise of the blocks %s\n"

+ "%s\n"), VERSION_NUMBER, "www.blockattack.net");

cout << desc << endl;

return 1;

}