diff options
| author | mydesktop <dev.mc2@gmail.com> | 2014-05-26 19:53:12 -0400 |
|---|---|---|
| committer | mydesktop <dev.mc2@gmail.com> | 2014-05-26 19:53:12 -0400 |
| commit | e995a7777a652607b85a0deb320615afea76c7c9 (patch) | |
| tree | 2017f2d4a4cd2aa90be4160933a5048c1bc21571 /src/simplewallet | |
| parent | maximum block size 130% of median (diff) | |
| parent | Merge pull request #16 from paybee/master (diff) | |
| download | monero-e995a7777a652607b85a0deb320615afea76c7c9.tar.xz | |
Merge remote-tracking branch 'origin/master' into 0.8.8update
Latest PR merged into experimental branch.
Diffstat (limited to 'src/simplewallet')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index b1fdd2688..9053dde1f 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1054,14 +1054,20 @@ 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); - - tools::signal_handler::install([&w] { w.stop(); - }); - w.run(); + w.deinit(); + } + else + { + tools::signal_handler::install([&w] { + w.stop(); + }); + w.run(); - w.deinit(); + w.deinit(); + } } return 1; //CATCH_ENTRY_L0("main", 1); |