diff options
| author | obscuren <geffobscura@gmail.com> | 2014-06-27 05:14:50 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-06-27 05:14:50 +0800 |
| commit | 2d274003b8618a0121d65f58e406afac45b8e569 (patch) | |
| tree | 195c8202b9873eedff2ee523ffc666c823eb5cc6 /ethereal | |
| parent | bf2ac5acc57def2b57454872f8cb493df01d44a7 (diff) | |
| parent | 52ddf044ae28cf84e61ced2d9193e7d5e806e1ef (diff) | |
| download | go-tangerine-2d274003b8618a0121d65f58e406afac45b8e569.tar go-tangerine-2d274003b8618a0121d65f58e406afac45b8e569.tar.gz go-tangerine-2d274003b8618a0121d65f58e406afac45b8e569.tar.bz2 go-tangerine-2d274003b8618a0121d65f58e406afac45b8e569.tar.lz go-tangerine-2d274003b8618a0121d65f58e406afac45b8e569.tar.xz go-tangerine-2d274003b8618a0121d65f58e406afac45b8e569.tar.zst go-tangerine-2d274003b8618a0121d65f58e406afac45b8e569.zip | |
Merge branch 'develop'
Conflicts:
install.sh
Diffstat (limited to 'ethereal')
| -rw-r--r-- | ethereal/main.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ethereal/main.go b/ethereal/main.go index 799b50e4b..1674b59d9 100644 --- a/ethereal/main.go +++ b/ethereal/main.go @@ -10,10 +10,11 @@ import ( ) func main() { - runtime.GOMAXPROCS(runtime.NumCPU()) - + // Leave QT on top at ALL times. qml.Init(nil) + runtime.GOMAXPROCS(runtime.NumCPU()) + var interrupted = false utils.RegisterInterrupt(func(os.Signal) { interrupted = true |