Merge branch 'develop'

This commit is contained in:
obscuren 2014-05-30 20:35:44 +02:00
commit 397e99fcc6

View File

@ -94,10 +94,11 @@ func (gui *Gui) Start(assetPath string) {
panic(err) panic(err)
} }
win.Show()
ethutil.Config.Log.AddLogSystem(gui) ethutil.Config.Log.AddLogSystem(gui)
ethutil.Config.Log.Infoln("[GUI] Starting GUI") ethutil.Config.Log.Infoln("[GUI] Starting GUI")
win.Show()
win.Wait() win.Wait()
gui.eth.Stop() gui.eth.Stop()