Merge pull request #432 from zooba/master

zooba · zooba · commit 45aab7e995f9 · 2015-06-15T09:59:51.000-07:00
Fixes #431 Survey/News command crashes VS
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;
+                });
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,16 @@ public int FDoIdle(uint grfidlef) {`
`75`	`75`
`76`	`76`	`internal event EventHandler<ComponentManagerEventArgs> OnIdle {`
`77`	`77`	`add {`
`78`		`- EnsureInit();`
`79`		`- _onIdle += value;`
	`78`	`+ _serviceProvider.GetUIThread().Invoke(() => {`
	`79`	`+ EnsureInit();`
	`80`	`+ _onIdle += value;`
	`81`	`+ });`
`80`	`82`	`}`
`81`	`83`	`remove {`
`82`		`- EnsureInit();`
`83`		`- _onIdle -= value;`
	`84`	`+ _serviceProvider.GetUIThread().Invoke(() => {`
	`85`	`+ EnsureInit();`
	`86`	`+ _onIdle -= value;`
	`87`	`+ });`
`84`	`88`	`}`
`85`	`89`	`}`
`86`	`90`