From d27afa1ac77a3f36c0082bf22ce0f57193288ac2 Mon Sep 17 00:00:00 2001
From: triplus <triplus@users.noreply.github.com>
Date: Fri, 5 May 2017 17:32:44 +0200
Subject: [PATCH] Improved persistent toolbars start logic

---
 src/Mod/Tux/PersistentToolbarsGui.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Mod/Tux/PersistentToolbarsGui.py b/src/Mod/Tux/PersistentToolbarsGui.py
index cbeb032c7c..c01e50020e 100644
--- a/src/Mod/Tux/PersistentToolbarsGui.py
+++ b/src/Mod/Tux/PersistentToolbarsGui.py
@@ -233,10 +233,19 @@ def onWorkbenchActivated():
 
 def onStart():
     """Start persistent toolbars."""
-
-    onWorkbenchActivated()
-    mw.mainWindowClosed.connect(onClose)
-    mw.workbenchActivated.connect(onWorkbenchActivated)
+    if mw.property("eventLoop"):
+        start = False
+        try:
+            mw.mainWindowClosed
+            mw.workbenchActivated
+            start = True
+        except AttributeError:
+            pass
+        if start:
+            timer.stop()
+            onWorkbenchActivated()
+            mw.mainWindowClosed.connect(onClose)
+            mw.workbenchActivated.connect(onWorkbenchActivated)
 
 
 def onClose():
@@ -246,6 +255,5 @@ def onClose():
     p.RemGroup("System")
 
 
-timer.setSingleShot(True)
 timer.timeout.connect(onStart)
-timer.start()
+timer.start(500)