kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
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

8
src/simplewallet/simplewallet.cpp
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);
} }