diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-18 20:39:01 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-18 20:39:01 +0800 |
| commit | d15f90645d5b2e90c441140972d9fe6ecd753643 (patch) | |
| tree | b1f024c3c01f25b67bc25ed0452a9b584dad984f /cmd/mist/main.go | |
| parent | a59dd393e71cc52b1f96973aef884af619166f38 (diff) | |
| parent | 0a1eeca41e6ba5920ba65d9b41654768299bc7e3 (diff) | |
| download | dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.gz dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.bz2 dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.lz dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.xz dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.zst dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.zip | |
Merge remote-tracking branch 'ethereum/conversion' 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 }) } |