diff options
| author | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-10-30 04:09:32 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-10-30 04:09:32 +0800 |
| commit | ce2ec1980bbc97fb9b2acc27c6249be1249fa44c (patch) | |
| tree | 975a2a75b04f0c7c3cc2004e020c66c9a10a57d0 /ethereum.go | |
| parent | f05d422a97bfdfbf141a455d25566779c4b32da9 (diff) | |
| parent | e252dbf989f8a8e08e3edcaf075febee315e53fd (diff) | |
| download | dexon-ce2ec1980bbc97fb9b2acc27c6249be1249fa44c.tar dexon-ce2ec1980bbc97fb9b2acc27c6249be1249fa44c.tar.gz dexon-ce2ec1980bbc97fb9b2acc27c6249be1249fa44c.tar.bz2 dexon-ce2ec1980bbc97fb9b2acc27c6249be1249fa44c.tar.lz dexon-ce2ec1980bbc97fb9b2acc27c6249be1249fa44c.tar.xz dexon-ce2ec1980bbc97fb9b2acc27c6249be1249fa44c.tar.zst dexon-ce2ec1980bbc97fb9b2acc27c6249be1249fa44c.zip | |
Merge pull request #166 from fjl/fix/mist-quit
Fix Mist Shutdown
Diffstat (limited to 'ethereum.go')
| -rw-r--r-- | ethereum.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ethereum.go b/ethereum.go index c2d209597..a389c663d 100644 --- a/ethereum.go +++ b/ethereum.go @@ -490,6 +490,9 @@ func (s *Ethereum) peerHandler(listener net.Listener) { } func (s *Ethereum) Stop() { + // Stop eventMux first, it will close all subscriptions. + s.eventMux.Stop() + // Close the database defer s.db.Close() @@ -514,7 +517,6 @@ func (s *Ethereum) Stop() { } s.txPool.Stop() s.stateManager.Stop() - s.eventMux.Stop() s.blockPool.Stop() ethlogger.Infoln("Server stopped") |