aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-05 16:14:58 +0800
committerobscuren <geffobscura@gmail.com>2015-03-05 16:14:58 +0800
commitc47866d25174bd783ee6bcd5b400d81d7bf598bb (patch)
tree01c71c40981f4f75e1721011006d2da96dfc3c2d /cmd
parent15f491e5007d1507f20d0edce36cc9c0bd5cbd37 (diff)
downloadgo-tangerine-c47866d25174bd783ee6bcd5b400d81d7bf598bb.tar
go-tangerine-c47866d25174bd783ee6bcd5b400d81d7bf598bb.tar.gz
go-tangerine-c47866d25174bd783ee6bcd5b400d81d7bf598bb.tar.bz2
go-tangerine-c47866d25174bd783ee6bcd5b400d81d7bf598bb.tar.lz
go-tangerine-c47866d25174bd783ee6bcd5b400d81d7bf598bb.tar.xz
go-tangerine-c47866d25174bd783ee6bcd5b400d81d7bf598bb.tar.zst
go-tangerine-c47866d25174bd783ee6bcd5b400d81d7bf598bb.zip
Miner fixes and updates (including miner)
Diffstat (limited to 'cmd')
-rw-r--r--cmd/mist/gui.go2
-rw-r--r--cmd/mist/ui_lib.go3
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()