diff options
| author | Thomas Winget <tewinget@gmail.com> | 2014-09-17 18:37:32 -0400 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-09-23 22:59:47 +0200 |
| commit | 24f325a33d149125b7cf5e91615cbc9e5b686a2b (patch) | |
| tree | 188c6257810de751d3041a7371a1a9cc8bc52702 | |
| parent | Fixed CMake search for libunbound (diff) | |
| download | monero-24f325a33d149125b7cf5e91615cbc9e5b686a2b.tar.xz | |
Fixed artifacts from cherry-picking devel->master
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f8222a35..c9a794c97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,8 @@ cmake_minimum_required(VERSION 2.8.6) +set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + if (NOT DEFINED ENV{DEVELOPER_LOCAL_TOOLS}) message(STATUS "Could not find DEVELOPER_LOCAL_TOOLS in env") 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}") 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(CMAKE_CONFIGURATION_TYPES "Debug;Release") enable_testing() diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index e2564236b..37974088a 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -921,7 +921,7 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_) // for now, move on only if one address found 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. // 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) { - 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 { |