aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/mist
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-16 04:53:50 +0800
committerobscuren <geffobscura@gmail.com>2014-12-16 04:53:50 +0800
commit52ca80bdd22004525dd1decbf7f9698380bff2be (patch)
treef57b89fc469aa06e116c2c4154eaf96f12ea03d8 /cmd/mist
parent0291eff99a79fa1c844a4214c326c4f2b5f913ff (diff)
downloaddexon-52ca80bdd22004525dd1decbf7f9698380bff2be.tar
dexon-52ca80bdd22004525dd1decbf7f9698380bff2be.tar.gz
dexon-52ca80bdd22004525dd1decbf7f9698380bff2be.tar.bz2
dexon-52ca80bdd22004525dd1decbf7f9698380bff2be.tar.lz
dexon-52ca80bdd22004525dd1decbf7f9698380bff2be.tar.xz
dexon-52ca80bdd22004525dd1decbf7f9698380bff2be.tar.zst
dexon-52ca80bdd22004525dd1decbf7f9698380bff2be.zip
Fixed deref ptr
The gui already waits and shuts down ethereum. There was no need to wait for an additional shutdown.
Diffstat (limited to 'cmd/mist')
-rw-r--r--cmd/mist/main.go10
1 files changed, 4 insertions, 6 deletions
diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index 1c0af5d8c..3ea6e8e91 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -69,6 +69,10 @@ func run() error {
utils.StartRpc(ethereum, RpcPort)
}
+ if StartWebSockets {
+ utils.StartWebSockets(ethereum)
+ }
+
gui := NewWindow(ethereum, config, clientIdentity, KeyRing, LogLevel)
gui.stdLog = stdLog
@@ -100,16 +104,10 @@ func main() {
utils.HandleInterrupt()
- if StartWebSockets {
- utils.StartWebSockets(ethereum)
- }
-
// we need to run the interrupt callbacks in case gui is closed
// this skips if we got here by actual interrupt stopping the GUI
if !interrupted {
utils.RunInterruptCallbacks(os.Interrupt)
}
- // this blocks the thread
- ethereum.WaitForShutdown()
logger.Flush()
}