diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-18 04:40:05 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-18 04:40:05 +0800 |
| commit | 142e81258cd7b77226d706c84f93da417aaaf426 (patch) | |
| tree | 3b84c4139d100252512db487c33e2be57191e5d3 /cmd/mist/main.go | |
| parent | 86661de07746cd4e4ad8d016afee9fa8074aa141 (diff) | |
| parent | 048d4ec5be5352dcb06f5123e3458b99aa151e6b (diff) | |
| download | dexon-142e81258cd7b77226d706c84f93da417aaaf426.tar dexon-142e81258cd7b77226d706c84f93da417aaaf426.tar.gz dexon-142e81258cd7b77226d706c84f93da417aaaf426.tar.bz2 dexon-142e81258cd7b77226d706c84f93da417aaaf426.tar.lz dexon-142e81258cd7b77226d706c84f93da417aaaf426.tar.xz dexon-142e81258cd7b77226d706c84f93da417aaaf426.tar.zst dexon-142e81258cd7b77226d706c84f93da417aaaf426.zip | |
Merge branch 'develop' into conversion
Diffstat (limited to 'cmd/mist/main.go')
| -rw-r--r-- | cmd/mist/main.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/mist/main.go b/cmd/mist/main.go index 256c08691..1c51233e3 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -65,6 +65,7 @@ func init() { utils.NodeKeyFileFlag, utils.RPCListenAddrFlag, utils.RPCPortFlag, + utils.JSpathFlag, } } @@ -111,7 +112,7 @@ func run(ctx *cli.Context) { gui := NewWindow(ethereum) utils.RegisterInterrupt(func(os.Signal) { gui.Stop() }) // gui blocks the main thread - gui.Start(ctx.GlobalString(assetPathFlag.Name)) + gui.Start(ctx.GlobalString(assetPathFlag.Name), ctx.GlobalString(utils.JSpathFlag.Name)) return nil }) } |