diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-10 17:03:46 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-10 17:03:46 +0800 |
| commit | fc1d1f9afd155fab1f614c6a0340233f90afafd6 (patch) | |
| tree | 3bcccd5f4f5a3400763820e5f529b4697c57dabe /cmd/mist | |
| parent | 3755cfccb366f165951a5f3e03c58bde91ff1e4a (diff) | |
| parent | 20fd60902b5c6bea7b7d9fb7b9031ce5925bffc4 (diff) | |
| download | dexon-fc1d1f9afd155fab1f614c6a0340233f90afafd6.tar dexon-fc1d1f9afd155fab1f614c6a0340233f90afafd6.tar.gz dexon-fc1d1f9afd155fab1f614c6a0340233f90afafd6.tar.bz2 dexon-fc1d1f9afd155fab1f614c6a0340233f90afafd6.tar.lz dexon-fc1d1f9afd155fab1f614c6a0340233f90afafd6.tar.xz dexon-fc1d1f9afd155fab1f614c6a0340233f90afafd6.tar.zst dexon-fc1d1f9afd155fab1f614c6a0340233f90afafd6.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'cmd/mist')
| -rw-r--r-- | cmd/mist/gui.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index d37d6f81b..66614478c 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -238,13 +238,11 @@ func (gui *Gui) insertTransaction(window string, tx *types.Transaction) { inout = "recv" } - var ( - ptx = xeth.NewTx(tx) - send = from.Hex() - rec = tx.To().Hex() - ) - ptx.Sender = send - ptx.Address = rec + ptx := xeth.NewTx(tx) + ptx.Sender = from.Hex() + if to := tx.To(); to != nil { + ptx.Address = to.Hex() + } if window == "post" { //gui.getObjectByName("transactionView").Call("addTx", ptx, inout) |