roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Fixed deref ptr

Browse Source 
The gui already waits and shuts down ethereum. There was no need to wait
for an additional shutdown.
This commit is contained in:
obscuren 2014-12-15 21:53:50 +01:00
parent 0291eff99a
commit 52ca80bdd2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/mist/main.go
View File

@ -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()
} }