Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 0.8.8update 

Latest PR merged into experimental branch.
This commit is contained in:
mydesktop 2014-05-26 19:53:12 -04:00
parent f545fd8ff0 377567534c
commit e995a7777a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/simplewallet/simplewallet.cpp
View File

@ -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);