diff --git a/make_releases.sh b/make_releases.sh index 16253bf14..36f5aa7a4 100755 --- a/make_releases.sh +++ b/make_releases.sh @@ -4,6 +4,12 @@ TAG=`git tag -l --points-at HEAD` COMMIT=`git rev-parse --short=9 HEAD` +# Build the 64-bit Windows release +USE_DEVICE_TREZOR=OFF make depends target=x86_64-w64-mingw32 -j12 +pushd ./build/x86_64-w64-mingw32/release/bin > /dev/null +zip -ur ~/releases/salvium-${TAG}-win64.zip salviumd.exe salvium-wallet-cli.exe salvium-wallet-rpc.exe +popd > /dev/null + # Build the 64-bit Apple Silicon release USE_DEVICE_TREZOR=OFF make depends target=aarch64-apple-darwin -j12 pushd ./build/aarch64-apple-darwin/release/bin > /dev/null @@ -22,10 +28,4 @@ pushd ./build/x86_64-linux-gnu/release/bin > /dev/null zip -ur ~/releases/salvium-${TAG}-linux-x86_64.zip salviumd salvium-wallet-cli salvium-wallet-rpc popd > /dev/null -# Build the 64-bit Windows release -USE_DEVICE_TREZOR=OFF make depends target=x86_64-w64-mingw32 -j12 -pushd ./build/x86_64-w64-mingw32/release/bin > /dev/null -zip -ur ~/releases/salvium-${TAG}-win64.zip salviumd.exe salvium-wallet-cli.exe salvium-wallet-rpc.exe -popd > /dev/null - # Finish diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index c68a1eee4..84d9fa4e6 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -11265,7 +11265,8 @@ std::vector wallet2::create_transactions_all(uint64_t below // gather all dust and non-dust outputs of specified subaddress (if any) and below specified threshold (if any) bool fund_found = false; - for (size_t idx = 0; idx < m_transfers_indices[asset_type].size(); idx++) + //for (size_t idx = 0; idx < m_transfers_indices[asset_type].size(); idx++) + for (const auto& idx: m_transfers_indices[asset_type]) { size_t i = m_transfers_indices[asset_type][idx]; const transfer_details& td = m_transfers[i];