From 52ca80bdd22004525dd1decbf7f9698380bff2be Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 15 Dec 2014 21:53:50 +0100
Subject: Fixed deref ptr
The gui already waits and shuts down ethereum. There was no need to wait
for an additional shutdown.
---
cmd/mist/main.go | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
(limited to 'cmd')
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()
}
--
cgit v1.2.3