diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-05 17:55:11 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-05 17:55:11 +0800 |
| commit | 45afbe5d9cdd3da2443d4d407fc1b57b03f6ce9b (patch) | |
| tree | 01c71c40981f4f75e1721011006d2da96dfc3c2d /cmd/mist | |
| parent | 7315962880e63de070c3b48c11bd249489df4141 (diff) | |
| parent | c47866d25174bd783ee6bcd5b400d81d7bf598bb (diff) | |
| download | dexon-45afbe5d9cdd3da2443d4d407fc1b57b03f6ce9b.tar dexon-45afbe5d9cdd3da2443d4d407fc1b57b03f6ce9b.tar.gz dexon-45afbe5d9cdd3da2443d4d407fc1b57b03f6ce9b.tar.bz2 dexon-45afbe5d9cdd3da2443d4d407fc1b57b03f6ce9b.tar.lz dexon-45afbe5d9cdd3da2443d4d407fc1b57b03f6ce9b.tar.xz dexon-45afbe5d9cdd3da2443d4d407fc1b57b03f6ce9b.tar.zst dexon-45afbe5d9cdd3da2443d4d407fc1b57b03f6ce9b.zip | |
Merge remote-tracking branch 'upstream/poc-9' into blockpool3
Diffstat (limited to 'cmd/mist')
| -rw-r--r-- | cmd/mist/gui.go | 2 | ||||
| -rw-r--r-- | cmd/mist/ui_lib.go | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index 4af0cff43..cbd8daf2f 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -159,8 +159,6 @@ func (gui *Gui) Stop() { gui.win.Hide() } - gui.uiLib.jsEngine.Stop() - guilogger.Infoln("Stopped") } diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 4fa6e8e55..098e8fca5 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -58,7 +58,8 @@ type UiLib struct { } func NewUiLib(engine *qml.Engine, eth *eth.Ethereum, assetPath string) *UiLib { - lib := &UiLib{XEth: xeth.New(eth), engine: engine, eth: eth, assetPath: assetPath, jsEngine: javascript.NewJSRE(eth), filterCallbacks: make(map[int][]int)} //, filters: make(map[int]*xeth.JSFilter)} + x := xeth.New(eth) + lib := &UiLib{XEth: x, engine: engine, eth: eth, assetPath: assetPath, jsEngine: javascript.NewJSRE(x), filterCallbacks: make(map[int][]int)} //, filters: make(map[int]*xeth.JSFilter)} lib.filterManager = filter.NewFilterManager(eth.EventMux()) go lib.filterManager.Start() |