From d0308010da5053c405c0ad269542e9a7449e9bfd Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Tue, 30 Jun 2015 23:14:05 +0900 Subject: [PATCH] Client-side fix for #1324 Print messages rather than throwing uncaught exceptions that kill the thread. I cannot fix the server side as I have no way to test it. --- lib/synchronizer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/synchronizer.py b/lib/synchronizer.py index 6ac8a9bc..9df903d4 100644 --- a/lib/synchronizer.py +++ b/lib/synchronizer.py @@ -146,12 +146,14 @@ class WalletSynchronizer(util.DaemonThread): hist.append( (tx_hash, item['height']) ) if len(hist) != len(result): - raise Exception("error: server sent history with non-unique txid", result) + self.print_error("error: server sent history with non-unique txid", result) + continue # check that the status corresponds to what was announced rs = requested_histories.pop(addr) if self.wallet.get_status(hist) != rs: - raise Exception("error: status mismatch: %s"%addr) + self.print_error("error: status mismatch: %s" % addr) + continue # store received history self.wallet.receive_history_callback(addr, hist)