Test any sprout

This commit is contained in:
jl777
2018-12-17 04:12:47 -11:00
parent 89c6763a8f
commit 97fe83f4b3

View File

@@ -4790,7 +4790,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
// Get available notes
std::vector<CSproutNotePlaintextEntry> sproutEntries,skipsprout;
std::vector<SaplingNoteEntry> saplingEntries,skipsapling;
pwalletMain->GetFilteredNotes(useAnySprout != 0 ? sproutEntries : skipsprout, useAnySapling != 0 ? saplingEntries : skipsapling, zaddrs);
pwalletMain->GetFilteredNotes(sproutEntries, useAnySprout == 0 ? saplingEntries : skipsapling, zaddrs);
// If Sapling is not active, do not allow sending from a sapling addresses.
if (!saplingActive && saplingEntries.size() > 0) {