Only block shutdown during Apply.

1 files changed, 0 insertions, 38 deletions

diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
index 6738a4a6..bb34a33e 100644
--- a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
@@ -22,15 +22,12 @@ namespace WixToolset.Mba.Core
         /// </summary>
         protected readonly IEngine engine;
 
-        private bool applying;
-
         /// <summary>
         /// Creates a new instance of the <see cref="BootstrapperApplication"/> class.
         /// </summary>
         protected BootstrapperApplication(IEngine engine)
         {
             this.engine = engine;
-            this.applying = false;
             this.asyncExecution = true;
         }
 
@@ -41,9 +38,6 @@ namespace WixToolset.Mba.Core
         public event EventHandler<ShutdownEventArgs> Shutdown;
 
         /// <inheritdoc/>
-        public event EventHandler<SystemShutdownEventArgs> SystemShutdown;
-
-        /// <inheritdoc/>
         public event EventHandler<DetectBeginEventArgs> DetectBegin;
 
         /// <inheritdoc/>
@@ -332,25 +326,6 @@ namespace WixToolset.Mba.Core
         }
 
         /// <summary>
-        /// Called by the engine, raises the <see cref="SystemShutdown"/> event.
-        /// </summary>
-        /// <param name="args">Additional arguments for this event.</param>
-        protected virtual void OnSystemShutdown(SystemShutdownEventArgs args)
-        {
-            EventHandler<SystemShutdownEventArgs> handler = this.SystemShutdown;
-            if (null != handler)
-            {
-                handler(this, args);
-            }
-            else if (null != args)
-            {
-                // Allow requests to shut down when critical or not applying.
-                bool critical = EndSessionReasons.Critical == (EndSessionReasons.Critical & args.Reasons);
-                args.Cancel = !critical && this.applying;
-            }
-        }
-
-        /// <summary>
         /// Called by the engine, raises the <see cref="DetectBegin"/> event.
         /// </summary>
         /// <param name="args">Additional arguments for this event.</param>
@@ -1433,15 +1408,6 @@ namespace WixToolset.Mba.Core
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnSystemShutdown(EndSessionReasons dwEndSession, ref bool fCancel)
-        {
-            SystemShutdownEventArgs args = new SystemShutdownEventArgs(dwEndSession, fCancel);
-            this.OnSystemShutdown(args);
-
-            fCancel = args.Cancel;
-            return args.HResult;
-        }
-
         int IBootstrapperApplication.OnDetectBegin(bool fCached, RegistrationType registrationType, int cPackages, ref bool fCancel)
         {
             DetectBeginEventArgs args = new DetectBeginEventArgs(fCached, registrationType, cPackages, fCancel);
@@ -1693,8 +1659,6 @@ namespace WixToolset.Mba.Core
 
         int IBootstrapperApplication.OnApplyBegin(int dwPhaseCount, ref bool fCancel)
         {
-            this.applying = true;
-
             ApplyBeginEventArgs args = new ApplyBeginEventArgs(dwPhaseCount, fCancel);
             this.OnApplyBegin(args);
 
@@ -1949,8 +1913,6 @@ namespace WixToolset.Mba.Core
             ApplyCompleteEventArgs args = new ApplyCompleteEventArgs(hrStatus, restart, recommendation, pAction);
             this.OnApplyComplete(args);
 
-            this.applying = false;
-
             pAction = args.Action;
             return args.HResult;
         }