Merge branch 'release/0.6.0' into develop

beca2234 · obscuren · 97004f7e · 44da1801 · beca2234
Commit beca2234 authored Jul 25, 2014 by obscuren
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

main.go ethereal/main.go +2 -3

No files found.
--- a/ethereal/main.go
+++ b/ethereal/main.go
@@ -14,11 +14,10 @@ const (
 )
 func main() {
-	// Leave QT on top at ALL times. Qt Needs to be initialized from the main thread
-	qml.Init(nil)
 	runtime.GOMAXPROCS(runtime.NumCPU())
+	qml.Init(nil)
 	var interrupted = false
 	utils.RegisterInterrupt(func(os.Signal) {
 		interrupted = true