diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-04-12 01:33:08 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-04-12 01:33:08 +0800 |
| commit | 4d18798468c82650ddc809a03a187999f2237813 (patch) | |
| tree | 65241f493ac0d9c8ce938b0246acabab361f2626 /ethereal/ui/gui.go | |
| parent | cf1ae41bc0bedeb5208dc00696c538c13f2183c6 (diff) | |
| parent | 8280dd65e63f5e8abac7ca1c41b337859a40dc49 (diff) | |
| download | go-tangerine-4d18798468c82650ddc809a03a187999f2237813.tar go-tangerine-4d18798468c82650ddc809a03a187999f2237813.tar.gz go-tangerine-4d18798468c82650ddc809a03a187999f2237813.tar.bz2 go-tangerine-4d18798468c82650ddc809a03a187999f2237813.tar.lz go-tangerine-4d18798468c82650ddc809a03a187999f2237813.tar.xz go-tangerine-4d18798468c82650ddc809a03a187999f2237813.tar.zst go-tangerine-4d18798468c82650ddc809a03a187999f2237813.zip | |
Fix merge conflicts
Diffstat (limited to 'ethereal/ui/gui.go')
| -rw-r--r-- | ethereal/ui/gui.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index 6184baee6..fa4a5c833 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -116,6 +116,7 @@ func (ui *Gui) Start(assetPath string) { ui.engine.LoadFile(uiLib.AssetPath("qml/transactions.qml")) ui.win = component.CreateWindow(nil) + uiLib.win = ui.win // Register the ui as a block processor //ui.eth.BlockManager.SecondaryBlockProcessor = ui |