From 1271d9132b7c7fa8d9eb1bb39908255d82010b22 Mon Sep 17 00:00:00 2001
From: triplus <triplus@users.noreply.github.com>
Date: Sat, 26 Jan 2019 13:58:30 +0100
Subject: [PATCH] Improve start reliability

---
 SelectorToolbar_Gui.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/SelectorToolbar_Gui.py b/SelectorToolbar_Gui.py
index 138af00..13c3bad 100644
--- a/SelectorToolbar_Gui.py
+++ b/SelectorToolbar_Gui.py
@@ -488,6 +488,15 @@ def onStart():
         tb.orientationChanged.connect(onOrientationChanged)
 
 
+def onPreStart():
+    """Improve start reliability and maintain FreeCAD 0.16 support."""
+    if App.Version()[1] < "17":
+        onStart()
+    else:
+        if mw.property("eventLoop"):
+            onStart()
+
+
 t = QtCore.QTimer()
-t.timeout.connect(onStart)
+t.timeout.connect(onPreStart)
 t.start(500)