diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-10 08:22:38 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-10 08:22:38 +0800 |
| commit | 0db4a0e898d09ffa7b6b1289e9a334edc0001cfa (patch) | |
| tree | a0b5c8381ab482550ef4800a06d4db086d76a983 /cmd/mist/gui.go | |
| parent | 94e543bc398efbb5c712b6e4cb48d8a57eb3400d (diff) | |
| parent | 0d64163fea3a266ceb71cb4c4ee5682052c9ca6c (diff) | |
| download | dexon-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.tar dexon-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.tar.gz dexon-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.tar.bz2 dexon-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.tar.lz dexon-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.tar.xz dexon-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.tar.zst dexon-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.zip | |
Merge branch 'poc-9' into develop
Diffstat (limited to 'cmd/mist/gui.go')
| -rw-r--r-- | cmd/mist/gui.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index 35bfdf9a3..53ca35574 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -88,7 +88,7 @@ func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, session st panic(err) } - xeth := xeth.New(ethereum) + xeth := xeth.New(ethereum, nil) gui := &Gui{eth: ethereum, txDb: db, xeth: xeth, @@ -99,7 +99,7 @@ func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, session st plugins: make(map[string]plugin), serviceEvents: make(chan ServEv, 1), } - data, _ := ethutil.ReadAllFile(path.Join(ethutil.Config.ExecPath, "plugins.json")) + data, _ := ethutil.ReadAllFile(path.Join(ethereum.DataDir, "plugins.json")) json.Unmarshal([]byte(data), &gui.plugins) return gui @@ -158,8 +158,6 @@ func (gui *Gui) Stop() { gui.win.Hide() } - gui.uiLib.jsEngine.Stop() - guilogger.Infoln("Stopped") } |