diff options
author | obscuren <geffobscura@gmail.com> | 2015-03-18 04:27:34 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-03-18 04:27:34 +0800 |
commit | 917050dc30d8717d7e0bba1257165c1aec44887f (patch) | |
tree | 712f8823391286438a0e5c3d1f53c4682254650e /cmd/mist/main.go | |
parent | fe819f3b9f7a2d8d842c53b7269ccceace533569 (diff) | |
parent | 53104b09fa823cb5457960b8518b9650a5b083da (diff) | |
download | go-tangerine-917050dc30d8717d7e0bba1257165c1aec44887f.tar go-tangerine-917050dc30d8717d7e0bba1257165c1aec44887f.tar.gz go-tangerine-917050dc30d8717d7e0bba1257165c1aec44887f.tar.bz2 go-tangerine-917050dc30d8717d7e0bba1257165c1aec44887f.tar.lz go-tangerine-917050dc30d8717d7e0bba1257165c1aec44887f.tar.xz go-tangerine-917050dc30d8717d7e0bba1257165c1aec44887f.tar.zst go-tangerine-917050dc30d8717d7e0bba1257165c1aec44887f.zip |
Merge branch 'develop' into rpcfrontier
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 }) } |