nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed artifacts from cherry-picking devel->master

Browse Source
This commit is contained in:
Thomas Winget 2014-09-17 18:37:32 -04:00 committed by Riccardo Spagni
parent 5bd343778f
commit 24f325a33d
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -30,6 +30,8 @@
cmake_minimum_required(VERSION 2.8.6) cmake_minimum_required(VERSION 2.8.6)
set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
if (NOT DEFINED ENV{DEVELOPER_LOCAL_TOOLS}) if (NOT DEFINED ENV{DEVELOPER_LOCAL_TOOLS})
message(STATUS "Could not find DEVELOPER_LOCAL_TOOLS in env") message(STATUS "Could not find DEVELOPER_LOCAL_TOOLS in env")
set(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT OFF) set(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT OFF)
@ -44,7 +46,6 @@ endif()
message(STATUS "BOOST_IGNORE_SYSTEM_PATHS defaults to ${BOOST_IGNORE_SYSTEM_PATHS_DEFAULT}") message(STATUS "BOOST_IGNORE_SYSTEM_PATHS defaults to ${BOOST_IGNORE_SYSTEM_PATHS_DEFAULT}")
option(BOOST_IGNORE_SYSTEM_PATHS "Ignore boost system paths for local boost ins tallation" $BOOST_IGNORE_SYSTEM_PATHS_DEFAULT) option(BOOST_IGNORE_SYSTEM_PATHS "Ignore boost system paths for local boost ins tallation" $BOOST_IGNORE_SYSTEM_PATHS_DEFAULT)
set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set(CMAKE_CONFIGURATION_TYPES "Debug;Release") set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
enable_testing() enable_testing()

4
src/simplewallet/simplewallet.cpp
View File

@ -921,7 +921,7 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_)
// for now, move on only if one address found // for now, move on only if one address found
if (addresses_from_dns.size() == 1) if (addresses_from_dns.size() == 1)
{ {
if (get_account_address_from_str(de.addr, addresses_from_dns[0])) if (get_account_address_from_str(de.addr, m_wallet->testnet(), addresses_from_dns[0]))
{ {
// if it was an address, prompt user for confirmation. // if it was an address, prompt user for confirmation.
// inform user of DNSSEC validation status as well. // inform user of DNSSEC validation status as well.
@ -959,7 +959,7 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_)
} }
else if (addresses_from_dns.size() > 1) else if (addresses_from_dns.size() > 1)
{ {
tools::fail_msg_writer() << "Multiple Monero addresses found for given URL: " << url << ", this is not yet supported."; fail_msg_writer() << "Multiple Monero addresses found for given URL: " << url << ", this is not yet supported.";
} }
else else
{ {