Merge pull request #16 from paybee/master

simplewallet exits when COMMAND is given as a command-line argument
This commit is contained in:
monero-project 2014-05-26 10:07:04 -04:00
commit 377567534c

View File

@ -1054,8 +1054,13 @@ 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);
w.stop();
w.deinit();
}
else
{
tools::signal_handler::install([&w] { tools::signal_handler::install([&w] {
w.stop(); w.stop();
}); });
@ -1063,6 +1068,7 @@ int main(int argc, char* argv[])
w.deinit(); w.deinit();
} }
}
return 1; return 1;
//CATCH_ENTRY_L0("main", 1); //CATCH_ENTRY_L0("main", 1);
} }