monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wallet_rpc_server: error out if wallet-file and wallet-dir are both used

Browse source
This commit is contained in:
moneromooo-monero 2018-09-04 09:18:46 +00:00
parent 91c7d68b2d
commit 97764bae3a
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/wallet/wallet_rpc_server.cpp
View file

@ -179,8 +179,13 @@ namespace tools
} }
} }
m_restricted = command_line::get_arg(*m_vm, arg_restricted); m_restricted = command_line::get_arg(*m_vm, arg_restricted);
if (command_line::has_arg(*m_vm, arg_wallet_dir)) if (!command_line::is_arg_defaulted(*m_vm, arg_wallet_dir))
{ {
if (!command_line::is_arg_defaulted(*m_vm, wallet_args::arg_wallet_file()))
{
MERROR(arg_wallet_dir.name << " and " << wallet_args::arg_wallet_file().name << " are incompatible, use only one of them");
return false;
}
m_wallet_dir = command_line::get_arg(*m_vm, arg_wallet_dir); m_wallet_dir = command_line::get_arg(*m_vm, arg_wallet_dir);
#ifdef _WIN32 #ifdef _WIN32
#define MKDIR(path, mode) mkdir(path) #define MKDIR(path, mode) mkdir(path)