diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-10-15 18:39:13 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-10-15 18:39:13 +0200 |
| commit | 71253c1dcdfa44a7fb50e0855825f5423a8518ac (patch) | |
| tree | 30fc46daf54453cf176d1127d48ef0ee437b04ad | |
| parent | Merge pull request #2589 (diff) | |
| parent | Remove network_address_base which has been merged with ipv4_network_address i... (diff) | |
| download | monero-71253c1dcdfa44a7fb50e0855825f5423a8518ac.tar.xz | |
Merge pull request #2592
dc19659d Remove network_address_base which has been merged with ipv4_network_address in 8b006877 (Michał Sałaban)
2183ade0 Don't try to create wallet-dir when it's not given, don't crash if wallet-dir already exists. (Michał Sałaban)
| -rw-r--r-- | src/debug_utilities/object_sizes.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/debug_utilities/object_sizes.cpp b/src/debug_utilities/object_sizes.cpp index 63b702700..e58da7395 100644 --- a/src/debug_utilities/object_sizes.cpp +++ b/src/debug_utilities/object_sizes.cpp @@ -84,7 +84,6 @@ int main(int argc, char* argv[]) SL(cryptonote::txpool_tx_meta_t); - SL(epee::net_utils::network_address_base); SL(epee::net_utils::ipv4_network_address); SL(epee::net_utils::network_address); SL(epee::net_utils::connection_context_base); diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 25f780134..4b5b1f84d 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -154,7 +154,7 @@ namespace tools #else #define MKDIR(path, mode) mkdir(path, mode) #endif - if (MKDIR(m_wallet_dir.c_str(), 0700) < 0) + if (!m_wallet_dir.empty() && MKDIR(m_wallet_dir.c_str(), 0700) < 0 && errno != EEXIST) { #ifdef _WIN32 LOG_ERROR(tr("Failed to create directory ") + m_wallet_dir); |