Merge remote-tracking branch 'origin/master' into 0.8.8update
Latest PR merged into experimental branch.
This commit is contained in:
commit
e995a7777a
1 changed files with 11 additions and 5 deletions
|
@ -1054,8 +1054,13 @@ int main(int argc, char* argv[])
|
|||
|
||||
std::vector<std::string> command = command_line::get_arg(vm, arg_command);
|
||||
if (!command.empty())
|
||||
{
|
||||
w.process_command(command);
|
||||
|
||||
w.stop();
|
||||
w.deinit();
|
||||
}
|
||||
else
|
||||
{
|
||||
tools::signal_handler::install([&w] {
|
||||
w.stop();
|
||||
});
|
||||
|
@ -1063,6 +1068,7 @@ int main(int argc, char* argv[])
|
|||
|
||||
w.deinit();
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
//CATCH_ENTRY_L0("main", 1);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue