Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-28 07:29:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2592

Browse Source 
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)
This commit is contained in:
Riccardo Spagni 2017-10-15 18:39:13 +02:00
commit 71253c1dcd
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/debug_utilities/object_sizes.cpp
View File

@ -84,7 +84,6 @@ int main(int argc, char* argv[])
SL(cryptonote::txpool_tx_meta_t); SL(cryptonote::txpool_tx_meta_t);
SL(epee::net_utils::network_address_base);
SL(epee::net_utils::ipv4_network_address); SL(epee::net_utils::ipv4_network_address);
SL(epee::net_utils::network_address); SL(epee::net_utils::network_address);
SL(epee::net_utils::connection_context_base); SL(epee::net_utils::connection_context_base);

2
src/wallet/wallet_rpc_server.cpp
View File

@ -154,7 +154,7 @@ namespace tools
#else #else
#define MKDIR(path, mode) mkdir(path, mode) #define MKDIR(path, mode) mkdir(path, mode)
#endif #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 #ifdef _WIN32
LOG_ERROR(tr("Failed to create directory ") + m_wallet_dir); LOG_ERROR(tr("Failed to create directory ") + m_wallet_dir);