From 0ad5898c0f9b0d777818d89356b74606f4b3c988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Mon, 11 May 2015 11:53:53 +0300
Subject: rpc, xeth: fix #881, gracefully handle offline whisper

---
 xeth/xeth.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'xeth/xeth.go')

diff --git a/xeth/xeth.go b/xeth/xeth.go
index ad8596803..b875fa6f1 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -79,7 +79,6 @@ func New(eth *eth.Ethereum, frontend Frontend) *XEth {
 	xeth := &XEth{
 		backend:          eth,
 		frontend:         frontend,
-		whisper:          NewWhisper(eth.Whisper()),
 		quit:             make(chan struct{}),
 		filterManager:    filter.NewFilterManager(eth.EventMux()),
 		logQueue:         make(map[int]*logQueue),
@@ -88,6 +87,9 @@ func New(eth *eth.Ethereum, frontend Frontend) *XEth {
 		messages:         make(map[int]*whisperFilter),
 		agent:            miner.NewRemoteAgent(),
 	}
+	if eth.Whisper() != nil {
+		xeth.whisper = NewWhisper(eth.Whisper())
+	}
 	eth.Miner().Register(xeth.agent)
 	if frontend == nil {
 		xeth.frontend = dummyFrontend{}
-- 
cgit v1.2.3