From 5ab8ca0868a94e776e297d47c31226d9e66cca38 Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Mon, 17 Apr 2017 13:22:59 +0400
Subject: [PATCH] fix race

---
 addrbook.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addrbook.go b/addrbook.go
index 5450c515f..8a1698f41 100644
--- a/addrbook.go
+++ b/addrbook.go
@@ -135,15 +135,15 @@ func (a *AddrBook) OnStart() error {
 	return nil
 }
 
-func (a *AddrBook) Wait() {
-	a.wg.Wait()
-}
-
 // OnStop implements Service.
 func (a *AddrBook) OnStop() {
 	a.BaseService.OnStop()
 }
 
+func (a *AddrBook) Wait() {
+	a.wg.Wait()
+}
+
 func (a *AddrBook) AddOurAddress(addr *NetAddress) {
 	a.mtx.Lock()
 	defer a.mtx.Unlock()
@@ -320,6 +320,8 @@ type addrBookJSON struct {
 func (a *AddrBook) saveToFile(filePath string) {
 	log.Info("Saving AddrBook to file", "size", a.Size())
 
+	a.mtx.Lock()
+	defer a.mtx.Unlock()
 	// Compile Addrs
 	addrs := []*knownAddress{}
 	for _, ka := range a.addrLookup {