Spore ModAPI Easy Installer: exit with ResultType on uninstall

Author: Rosalie241

ModAPI Installers/ModAPI Installers.csproj

@@ -54,6 +54,7 @@
     <Compile Include="Permissions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SporePath.cs" />
+    <Compile Include="Types.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="CommonStrings.resx">

ModAPI Installers/Types.cs

@@ -0,0 +1,14 @@
+namespace ModAPI_Installers.Types
+{
+    public enum ResultType
+    {
+        Success = 0,
+        InstallerExecuted,  // we have found a custom installer, close Easy installer and execute that one
+        UnsupportedFile,
+        GalacticAdventuresNotFound,
+        UnauthorizedAccess,
+        InvalidPath,
+        ModNotInstalled,
+        NoInstallerFound
+    }
+}

Spore ModAPI Easy Installer/EasyInstaller.cs

@@ -17,6 +17,7 @@
 using System.Runtime.InteropServices;
 using System.Xml;
 using ModApi.UpdateManager;
+using ModAPI_Installers.Types;
 
 namespace Spore_ModAPI_Easy_Installer
 {
@@ -38,17 +39,6 @@ enum FileType
             Spore_Package // a .package that goes to the Spore data folder instead of the EP1 one
         }
 
-        public enum ResultType
-        {
-            Success,
-            InstallerExecuted,  // we have found a custom installer, close Easy installer and execute that one
-            UnsupportedFile,
-            GalacticAdventuresNotFound,
-            UnauthorizedAccess,
-            InvalidPath,
-            ModNotInstalled,
-            NoInstallerFound
-        }
         //// Show a file chooser and returns the path selected. It can ask for files or directories.
         //static string ShowFileChooser(FileChooserType type, string title, string filter);
 

Spore ModAPI Easy Installer/XmlInstallerWindow.xaml.cs

@@ -15,6 +15,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 using System.Xml;
+using ModAPI_Installers.Types;
 
 namespace Spore_ModAPI_Easy_Installer
 {
@@ -62,7 +63,7 @@ public partial class XmlInstallerWindow : DecoratableWindow
 
         public static string SporeDataPath = SporePath.MoveToData(SporePath.Game.Spore, SporePath.GetRealParent(PathDialogs.ProcessSpore()));
 
-        private EasyInstaller.ResultType _result = EasyInstaller.ResultType.ModNotInstalled;
+        private ResultType _result = ResultType.ModNotInstalled;
 
         public XmlInstallerWindow(string modName, bool configure, bool uninstall)
         {
@@ -96,7 +97,7 @@ public XmlInstallerWindow(string modName, bool configure, bool uninstall)
             }
         }
 
-        public EasyInstaller.ResultType GetResult()
+        public ResultType GetResult()
         {
             return _result;
         }
@@ -690,7 +691,7 @@ await Dispatcher.BeginInvoke(new Action(() =>
                     XmlInstallerCancellation.Cancellation[ModName] = true;
                     _installerState = 2;
                     _installerMode = 1;
-                    _result = EasyInstaller.ResultType.ModNotInstalled;
+                    _result = ResultType.ModNotInstalled;
                     Close();
                 }
 
@@ -879,19 +880,19 @@ await Task.Run(() =>
                 if (_installerMode == 1)
                 {
                     _installerState = 2;
-                    _result = EasyInstaller.ResultType.Success;
+                    _result = ResultType.Success;
                     Close();
                 }
                 else
                 {
                     CyclePage(0, 1);
-                    _result = EasyInstaller.ResultType.Success;
+                    _result = ResultType.Success;
                     _installerState = 2;
                 }
             }
             catch (Exception ex)
             {
-                _result = EasyInstaller.ResultType.ModNotInstalled;
+                _result = ResultType.ModNotInstalled;
                 ErrorInfoTextBlock.Text = ex.ToString();
                 CyclePage(0, 3);
             }
@@ -1046,12 +1047,18 @@ await Task.Run(() =>
 
                 if (_isUninstallingOnly)
                 {
+                    _result = ResultType.Success;
                     Close();
                 }
-                //Process.GetCurrentProcess().Kill();
             }
             catch (Exception ex)
             {
+                // dummy error so that the uninstaller
+                // knows this mod failed to uninstall
+                if (_isUninstallingOnly)
+                {
+                    _result = ResultType.UnsupportedFile;
+                }
                 ErrorInfoTextBlock.Text = ex.ToString();
                 CyclePage(0, 3);
             }
@@ -1397,7 +1404,7 @@ private void XmlInstallerWindow_Closed(object sender, EventArgs e)
             if (installerWindows.Contains(this))
                 installerWindows.Remove(this);
             if (_isConfigurator)
-                Process.GetCurrentProcess().Kill();
+                Environment.Exit((int)_result);
         }
 
         private void SplashBorder_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)