Fixed deref ptr

The gui already waits and shuts down ethereum. There was no need to wait
for an additional shutdown.
pull/211/head
obscuren 10 years ago
parent 0291eff99a
commit 52ca80bdd2
  1. 10
      cmd/mist/main.go

@ -69,6 +69,10 @@ func run() error {
utils.StartRpc(ethereum, RpcPort) utils.StartRpc(ethereum, RpcPort)
} }
if StartWebSockets {
utils.StartWebSockets(ethereum)
}
gui := NewWindow(ethereum, config, clientIdentity, KeyRing, LogLevel) gui := NewWindow(ethereum, config, clientIdentity, KeyRing, LogLevel)
gui.stdLog = stdLog gui.stdLog = stdLog
@ -100,16 +104,10 @@ func main() {
utils.HandleInterrupt() utils.HandleInterrupt()
if StartWebSockets {
utils.StartWebSockets(ethereum)
}
// we need to run the interrupt callbacks in case gui is closed // we need to run the interrupt callbacks in case gui is closed
// this skips if we got here by actual interrupt stopping the GUI // this skips if we got here by actual interrupt stopping the GUI
if !interrupted { if !interrupted {
utils.RunInterruptCallbacks(os.Interrupt) utils.RunInterruptCallbacks(os.Interrupt)
} }
// this blocks the thread
ethereum.WaitForShutdown()
logger.Flush() logger.Flush()
} }

Loading…
Cancel
Save