mirror of
https://codeberg.org/anoncontributorxmr/monero.git
synced 2024-11-30 06:43:28 +01:00
Merge remote-tracking branch 'origin/master' into 0.8.8update
Latest PR merged into experimental branch.
This commit is contained in:
commit
e995a7777a
@ -1054,14 +1054,20 @@ int main(int argc, char* argv[])
|
|||||||
|
|
||||||
std::vector<std::string> command = command_line::get_arg(vm, arg_command);
|
std::vector<std::string> command = command_line::get_arg(vm, arg_command);
|
||||||
if (!command.empty())
|
if (!command.empty())
|
||||||
|
{
|
||||||
w.process_command(command);
|
w.process_command(command);
|
||||||
|
|
||||||
tools::signal_handler::install([&w] {
|
|
||||||
w.stop();
|
w.stop();
|
||||||
});
|
w.deinit();
|
||||||
w.run();
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
tools::signal_handler::install([&w] {
|
||||||
|
w.stop();
|
||||||
|
});
|
||||||
|
w.run();
|
||||||
|
|
||||||
w.deinit();
|
w.deinit();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
//CATCH_ENTRY_L0("main", 1);
|
//CATCH_ENTRY_L0("main", 1);
|
||||||
|
Loading…
Reference in New Issue
Block a user