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

Merge pull request #1716 

b560ed4a daemon: silence spurious warning about uninitialized variable (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-02-21 11:23:38 +02:00
parent 59d96eedd8 b560ed4ac6
commit 826f49485e
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/daemon/daemon.cpp
View File

@ -124,18 +124,18 @@ bool t_daemon::run(bool interactive)
return false; return false;
mp_internals->rpc.run(); mp_internals->rpc.run();
daemonize::t_command_server* rpc_commands; std::unique_ptr<daemonize::t_command_server> rpc_commands;
if (interactive) if (interactive)
{ {
// The first three variables are not used when the fourth is false // The first three variables are not used when the fourth is false
rpc_commands = new daemonize::t_command_server(0, 0, boost::none, false, mp_internals->rpc.get_server()); rpc_commands.reset(new daemonize::t_command_server(0, 0, boost::none, false, mp_internals->rpc.get_server()));
rpc_commands->start_handling(std::bind(&daemonize::t_daemon::stop_p2p, this)); rpc_commands->start_handling(std::bind(&daemonize::t_daemon::stop_p2p, this));
} }
mp_internals->p2p.run(); // blocks until p2p goes down mp_internals->p2p.run(); // blocks until p2p goes down
if (interactive) if (rpc_commands)
{ {
rpc_commands->stop_handling(); rpc_commands->stop_handling();
} }