Index: Core/Common/src/Core.Common.Base/Service/Activity.cs =================================================================== diff -u -rfae525350cc755ecc783bd4ac3fc13aed2e4ccaa -rf421ea0848e81715819aa0cdb2e2129bba81c089 --- Core/Common/src/Core.Common.Base/Service/Activity.cs (.../Activity.cs) (revision fae525350cc755ecc783bd4ac3fc13aed2e4ccaa) +++ Core/Common/src/Core.Common.Base/Service/Activity.cs (.../Activity.cs) (revision f421ea0848e81715819aa0cdb2e2129bba81c089) @@ -113,32 +113,7 @@ /// public void Finish() { - if (State == ActivityState.None) - { - return; - } - - ChangeState(OnFinish, State == ActivityState.Executed ? ActivityState.Finished : State); // If relevant, preserve the previous state - - if (State == ActivityState.Finished) - { - log.InfoFormat(Resources.Activity_Finish_ActivityDescription_0_has_succeeded, Description); - } - - if (State == ActivityState.Canceled) - { - log.WarnFormat(Resources.Activity_Finish_ActivityDescription_0_has_been_canceled, Description); - } - - if (State == ActivityState.Failed) - { - log.ErrorFormat(Resources.Activity_Finish_ActivityDescription_0_has_failed, Description); - } - - if (State == ActivityState.Skipped) - { - log.InfoFormat(Resources.Activity_Finish_ActivityDescription_0_has_been_skipped, Description); - } + OnFinish(); } /// @@ -193,5 +168,33 @@ State = stateAfter; } + + public void LogState() + { + if (State == ActivityState.None) + { + return; + } + + if (State == ActivityState.Executed) + { + log.InfoFormat(Resources.Activity_Finish_ActivityDescription_0_has_succeeded, Description); + } + + if (State == ActivityState.Canceled) + { + log.WarnFormat(Resources.Activity_Finish_ActivityDescription_0_has_been_canceled, Description); + } + + if (State == ActivityState.Failed) + { + log.ErrorFormat(Resources.Activity_Finish_ActivityDescription_0_has_failed, Description); + } + + if (State == ActivityState.Skipped) + { + log.InfoFormat(Resources.Activity_Finish_ActivityDescription_0_has_been_skipped, Description); + } + } } } \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs =================================================================== diff -u -r357925a9ba2aebce58a9e03e620c6d470323672f -rf421ea0848e81715819aa0cdb2e2129bba81c089 --- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 357925a9ba2aebce58a9e03e620c6d470323672f) +++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision f421ea0848e81715819aa0cdb2e2129bba81c089) @@ -162,6 +162,7 @@ runningActivity.ProgressChanged += ActivityOnProgressChanged; runningActivity.Run(); + runningActivity.LogState(); } finally {