From 8e92162d2c522d6dfa34cd7729c96231967e21c8 Mon Sep 17 00:00:00 2001 From: mydesktop Date: Wed, 30 Apr 2014 13:01:32 -0400 Subject: Warn user on attempting to remove build directory for make clean --- Makefile | 3 +++ src/wallet/wallet2.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 451319b08..65b72d4e1 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,9 @@ test-release: build-release all-release: build-release clean: + @echo "WARNING: Back-up your wallet if it exists within ./build!" ; \ + read -r -p "This will destroy the build directory, continue (y/N)?: " CONTINUE; \ + [ $$CONTINUE = "y" ] || [ $$CONTINUE = "Y" ] || (echo "Exiting."; exit 1;) rm -rf build tags: diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 6a573c49e..3c64c75c0 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -38,7 +38,7 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_ uint64_t tx_money_got_in_outs = 0; crypto::public_key tx_pub_key = null_pkey; bool r = parse_and_validate_tx_extra(tx, tx_pub_key); - THROW_WALLET_EXCEPTION_IF(!r, error::tx_extra_parse_error, tx); + // THROW_WALLET_EXCEPTION_IF(!r, error::tx_extra_parse_error, tx); r = lookup_acc_outs(m_account.get_keys(), tx, tx_pub_key, outs, tx_money_got_in_outs); THROW_WALLET_EXCEPTION_IF(!r, error::acc_outs_lookup_error, tx, tx_pub_key, m_account.get_keys()); -- cgit v1.2.3