Merge pull request #2592
dc19659d
Remove network_address_base which has been merged with ipv4_network_address in8b006877
(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:
commit
71253c1dcd
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue