From ae332547baec9b4f13d94451240ea5baaa3c726e Mon Sep 17 00:00:00 2001
From: Martin Boehm <martin.boehm@1mbsoftware.net>
Date: Wed, 6 Feb 2019 17:35:10 +0100
Subject: [PATCH] Fix loading of txids for xpub

---
 api/xpub.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/xpub.go b/api/xpub.go
index a5528a32..b03b5700 100644
--- a/api/xpub.go
+++ b/api/xpub.go
@@ -126,6 +126,7 @@ func (w *Worker) xpubCheckAndLoadTxids(ad *xpubAddress, filter *AddressFilter, m
 			}
 			return err
 		}
+		return nil
 	}
 	// unless the filter is completely off, load all txids
 	if filter.FromHeight != 0 || filter.ToHeight != 0 || filter.Vout != AddressFilterVoutOff {
@@ -302,12 +303,12 @@ func (w *Worker) GetAddressForXpub(xpub string, page int, txsOnPage int, option
 		}
 		if option >= TxidHistory {
 			for i := range data.addresses {
-				if err = w.xpubCheckAndLoadTxids(&data.addresses[i], filter, bestheight, txsOnPage); err != nil {
+				if err = w.xpubCheckAndLoadTxids(&data.addresses[i], filter, bestheight, (page+1)*txsOnPage); err != nil {
 					return nil, err
 				}
 			}
 			for i := range data.changeAddresses {
-				if err = w.xpubCheckAndLoadTxids(&data.changeAddresses[i], filter, bestheight, txsOnPage); err != nil {
+				if err = w.xpubCheckAndLoadTxids(&data.changeAddresses[i], filter, bestheight, (page+1)*txsOnPage); err != nil {
 					return nil, err
 				}
 			}