Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs =================================================================== diff -u -ra7e62eddad040f5d9585c279ebc1d84bc84b241e -r7fa9d1d4bd2b726adab382355d0e3adaf6d8d150 --- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision a7e62eddad040f5d9585c279ebc1d84bc84b241e) +++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 7fa9d1d4bd2b726adab382355d0e3adaf6d8d150) @@ -112,24 +112,12 @@ } private set { - if (activityRunner != null) - { - activityRunner.IsRunningChanged -= ActivityRunnerIsRunningChanged; - activityRunner.ActivityCompleted -= ActivityRunnerActivityCompleted; - } - activityRunner = value; if (RunningActivityLogAppender.Instance != null) { RunningActivityLogAppender.Instance.ActivityRunner = value; } - - if (activityRunner != null) - { - activityRunner.IsRunningChanged += ActivityRunnerIsRunningChanged; - activityRunner.ActivityCompleted += ActivityRunnerActivityCompleted; - } } } @@ -586,32 +574,6 @@ } } - [InvokeRequired] - private void ActivityRunnerIsRunningChanged(object sender, EventArgs e) - { - if (isExiting) - { - return; - } - - if (!ActivityRunner.IsRunning) - { - ResumeUI(); - } - } - - [InvokeRequired] - private void ActivityRunnerActivityCompleted(object sender, ActivityEventArgs e) - { - if (MainWindow == null || MainWindow.PropertyGrid == null) - { - return; - } - - // Force refresh of propertygrid (not done automaticly because events are disabled during import) - MainWindow.PropertyGrid.Data = MainWindow.PropertyGrid.GetObjectProperties(Selection); - } - private void ApplicationProjectOpened(Project project) { ResumeUI(); Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs =================================================================== diff -u -rbc238ea43fae81b8a49aa2bdb2c8349815c46039 -r7fa9d1d4bd2b726adab382355d0e3adaf6d8d150 --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs (.../SharpMapGisGuiPlugin.cs) (revision bc238ea43fae81b8a49aa2bdb2c8349815c46039) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs (.../SharpMapGisGuiPlugin.cs) (revision 7fa9d1d4bd2b726adab382355d0e3adaf6d8d150) @@ -136,11 +136,6 @@ gui.DocumentViews.ActiveViewChanged += DocumentViewsActiveViewChanged; gui.DocumentViews.ChildViewChanged += DocumentViewsActiveViewChanged; gui.ProjectClosing += ApplicationProjectClosing; - - if (gui.ActivityRunner != null) - { - gui.ActivityRunner.ActivityCompleted += ActivityRunnerOnActivityCompleted; - } } public override void Dispose() @@ -155,14 +150,6 @@ documentViews.ActiveViewChanged -= DocumentViewsActiveViewChanged; } gui.ProjectClosing -= ApplicationProjectClosing; - - if (gui.ApplicationCore != null) - { - if (gui.ActivityRunner != null) - { - gui.ActivityRunner.ActivityCompleted -= ActivityRunnerOnActivityCompleted; - } - } } gui = null; @@ -296,19 +283,6 @@ RefreshRibbonItems(); } - private void ActivityRunnerOnActivityCompleted(object sender, ActivityEventArgs e) - { - if (mapLegendView == null) - { - return; - } - - // Force a refresh of the map legend view (tree view) - mapLegendView.Data = null; - - UpdateMapLegendView(); - } - private static void UpdateMapLegendView() { if (mapLegendView == null)