Closes #22

Author: krisdb2009

SuperGrate/Classes/Misc.cs

@@ -167,7 +167,7 @@ public static Task DeleteFromStore(string[] SIDs)
                 }
             });
         }
-        public static Task DeleteFromTarget(string Target, string[] SIDs)
+        public static Task DeleteFromSource(string Target, string[] SIDs)
         {
             ShouldCancelRemoteProfileDelete = false;
             return Task.Run(async () =>
@@ -183,6 +183,7 @@ public static Task DeleteFromTarget(string Target, string[] SIDs)
                         Properties.Resources.SuperGrateProfileDelete.Length
                     );
                     SuperGratePD.Close();
+                    int count = 0;
                     foreach (string SID in SIDs)
                     {
                         if (ShouldCancelRemoteProfileDelete) break;
@@ -193,6 +194,9 @@ await Remote.StartProcess(
                             @"C:\ProgramData\SuperGratePD.exe " + SID,
                             @"C:\ProgramData\"
                         );
+                        Main.Progress.Invoke(new Action(() => {
+                            Main.Progress.Value = (int)((++count - 0.5) / SIDs.Length * 100);
+                        }));
                         await Remote.WaitForProcessExit(Target, "SuperGratePD");
                     }
                     Logger.Information("Removing Daemon...");

SuperGrate/Main.cs

@@ -33,15 +33,11 @@ private void Main_Load(object sender, EventArgs e)
             Logger.Success("Welcome to Super Grate! v" + Application.ProductVersion);
             Logger.Information("Enter some information to get started!");
             UpdateFormRestrictions();
-
-
-
             /*
             Logger.Information("Downloading...");
             await new Download("https://github.com/belowaverage-org/SuperGrate/raw/master/USMT/x64.zip", @".\asdf.zip").Start();
             Logger.Success("Done!");
             */
-
         }
         private RunningTask Running {
             get {
@@ -102,15 +98,20 @@ private async void BtStartStop_Click(object sender, EventArgs e)
                 {
                     SIDs[count++] = ((string[])lbxUsers.Tag)[index];
                 }
+                bool setting;
+                bool success;
                 if (CurrentListSource == ListSources.SourceComputer)
                 {
-                    await USMT.Do(USMTMode.ScanState, SIDs);
+                    success = await USMT.Do(USMTMode.ScanState, SIDs);
+                    if (bool.TryParse(Config.Settings["AutoDeleteFromSource"], out setting) && setting && success)
+                    {
+                        await Misc.DeleteFromSource(SourceComputer, SIDs);
+                    }
                 }
                 if (tbDestinationComputer.Text != "" && Running == RunningTask.USMT)
                 {
-                    await USMT.Do(USMTMode.LoadState, SIDs);
-                    bool setting;
-                    if (bool.TryParse(Config.Settings["AutoDeleteFromStore"], out setting) && setting)
+                    success = await USMT.Do(USMTMode.LoadState, SIDs);
+                    if (bool.TryParse(Config.Settings["AutoDeleteFromStore"], out setting) && setting && success)
                     {
                         await Misc.DeleteFromStore(SIDs);
                     }
@@ -238,7 +239,7 @@ private async void BtnDelete_Click(object sender, EventArgs e)
             }
             else if(CurrentListSource == ListSources.SourceComputer)
             {
-                await Misc.DeleteFromTarget(SourceComputer, SIDs.ToArray());
+                await Misc.DeleteFromSource(SourceComputer, SIDs.ToArray());
                 Running = RunningTask.None;
                 btnListSource.PerformClick();
             }