Merge pull request #432 from zooba/master

Fixes #431 Survey/News command crashes VS
microsoft · Jun 15, 2015 · 45aab7e · 45aab7e
2 parents 02ef26e + 380dec1
commit 45aab7e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Common/Product/SharedProject/IdleManager.cs b/Common/Product/SharedProject/IdleManager.cs
@@ -75,12 +75,16 @@ public int FDoIdle(uint grfidlef) {
 
         internal event EventHandler<ComponentManagerEventArgs> OnIdle {
             add {
-                EnsureInit();
-                _onIdle += value;
+                _serviceProvider.GetUIThread().Invoke(() => {
+                    EnsureInit();
+                    _onIdle += value;
+                });
             }
             remove {
-                EnsureInit();
-                _onIdle -= value;
+                _serviceProvider.GetUIThread().Invoke(() => {
+                    EnsureInit();
+                    _onIdle -= value;
+                });
             }
         }