From 472d6b0c1e13c0f76bbf33574aca881e093d9340 Mon Sep 17 00:00:00 2001
From: Josh Rickmar <jrick@conformal.com>
Date: Wed, 13 May 2015 16:34:26 -0400
Subject: [PATCH] Prevent duplicate waddrmgr lock error.

Fixes #270.
---
 wallet/wallet.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/wallet/wallet.go b/wallet/wallet.go
index 4d1b4a5..f697452 100644
--- a/wallet/wallet.go
+++ b/wallet/wallet.go
@@ -611,12 +611,14 @@ out:
 
 		// Select statement fell through by an explicit lock or the
 		// timer expiring.  Lock the manager here.
-		timeout = nil
-		err := w.Manager.Lock()
-		if err != nil {
-			log.Errorf("Could not lock wallet: %v", err)
-		} else {
-			w.notifyLockStateChange(true)
+		if timeout != nil {
+			timeout = nil
+			err := w.Manager.Lock()
+			if err != nil {
+				log.Errorf("Could not lock wallet: %v", err)
+			} else {
+				w.notifyLockStateChange(true)
+			}
 		}
 	}
 	w.wg.Done()