Added ability to apply profile multiple times

You need to go into the Profile Settings to set the number of times that the profile is applied, and how long the delay should be in seconds before it is reapplied each time. Fixes #316 (well it provides a workaround for #316).

Note - The target display profile you have selected in the game shortcut will be applied as per the number of times that it is set in the target display profile, but the profile that is reverted back to will only ever be applied once! This is because the display profile that you start with is a temporary display profile that is only stored whilst the game is being run. It is discarded when the game shortcut has finished processeing and everything is reverted back.

A second change I made was to extend the default timeout for waiting for a game or exe to start to be 60 seconds. It hwas fairly common that a game would take too long to start, and it would timeout and DM would revert the display, only for the game to then finish starting (but the display profile would have reverted back). Extending the timeout fixes that issue.

Lastly, a few Task.Delays were incorrectly being used, as they were not pausing properly. I added the .Wait(cancelToken) to them so that they would properly delay, and yet would be cancellable so that the user could cancel if they wanted.

Author: terrymacdonald

DisplayMagician/ShortcutItem.cs

@@ -164,7 +164,7 @@ public class ShortcutItem : IComparable
         private string _gameAppId = "";
         private string _gameName = "";
         private SupportedGameLibraryType _gameLibrary = SupportedGameLibraryType.Unknown;
-        private int _startTimeout = 20;
+        private int _startTimeout = 60;
         private string _gameArguments = "";
         private bool _gameArgumentsRequired = false;
         private string _differentGameExeToMonitor = "";
@@ -573,7 +573,7 @@ public Keys Hotkey
             }
         }
 
-        [DefaultValue(20)]
+        [DefaultValue(60)]
         public int StartTimeout
         {
             get
@@ -1017,7 +1017,7 @@ public void UpdateNoGameShortcut(
             _monitorDifferentGameExe = false;
             _differentGameExeToMonitor = "";
             _processPriority = ProcessPriority.Normal;
-            _startTimeout = 20;
+            _startTimeout = 60;
 
             ReplaceShortcutIconInCache();
             RefreshValidity();

DisplayMagician/ShortcutRepository.cs

@@ -1352,8 +1352,8 @@ public static RunShortcutResult RunShortcut(ShortcutItem shortcutToUse, ref Canc
                     logger.Error(ex, $"ShortcutRepository/RunShortcut: Exception caused whilst starting UWP App {appToUse.Name}.");
                 }
 
-                // Wait an extra few seconds to give the application time to settle down
-                //Thread.Sleep(2000);
+                // Wait an extra 2 seconds to give the application time to settle down
+                //Task.Delay(2000).Wait(cancelToken);
 
                 // Now we need to decide what we are monitoring. If the user has supplied an alternative process to monitor, then we monitor that instead!
                 bool foundSomethingToMonitor = false;
@@ -1443,8 +1443,8 @@ public static RunShortcutResult RunShortcut(ShortcutItem shortcutToUse, ref Canc
                     // We use the a user supplied executable as the thing we're monitoring instead!
                     try
                     {
-                        // Wait 3 seconds for the different executable to start up. If there is a loader involved we want to give it some time.
-                        Task.Delay(3000);
+                        // Wait 10 seconds for the different executable to start up. If there is a loader involved we want to give it a good amount of time to load.
+                        Task.Delay(10000).Wait(cancelToken);
                         processesToMonitor.AddRange(Process.GetProcessesByName(ProcessUtils.GetProcessName(shortcutToUse.DifferentExecutableToMonitor)));
                         if (processesToMonitor.Count > 0)
                         {

DisplayMagician/UIForms/ProfileSettingsForm.Designer.cs

@@ -91,6 +91,36 @@ private void ProfileSettingsForm_Load(object sender, EventArgs e)
                 cmb_wallpaper_display_mode.SelectedIndex = 0;
             }
 
+            if (Profile.ApplyProfileCount >= 0 && Profile.ApplyProfileCount <= 10)
+            {
+                nud_apply_profile_count.Value = Profile.ApplyProfileCount;
+            }
+            else
+            {
+                nud_apply_profile_count.Value = 1;
+            }
+
+            if (Profile.ApplyProfileDelay >= 0 && Profile.ApplyProfileDelay <= 1000)
+            {
+                nud_apply_profile_delay.Value = Profile.ApplyProfileDelay;
+            }
+            else
+            {
+                nud_apply_profile_delay.Value = 0;
+            }
+
+            if (nud_apply_profile_count.Value > 1)
+            {
+                lbl_apply_profile_delay.Visible = true;
+                nud_apply_profile_delay.Visible = true;
+                lbl_seconds.Visible = true;
+            }
+            else
+            {
+                lbl_apply_profile_delay.Visible = false;
+                nud_apply_profile_delay.Visible = false;
+                lbl_seconds.Visible = false;
+            }
         }
 
         private void ProfileSettingsForm_FormClosing(object sender, FormClosingEventArgs e)
@@ -110,6 +140,10 @@ private void ProfileSettingsForm_FormClosing(object sender, FormClosingEventArgs
 
             Profile.WallpaperStyle = ((KeyValuePair<Wallpaper.Style, string>)cmb_wallpaper_display_mode.SelectedItem).Key;
 
+            Profile.ApplyProfileCount = (int)nud_apply_profile_count.Value;
+
+            Profile.ApplyProfileDelay = (int)nud_apply_profile_delay.Value;
+
         }
 
         private void btn_back_Click(object sender, EventArgs e)
@@ -319,5 +353,27 @@ private void rb_leave_wallpaper_CheckedChanged(object sender, EventArgs e)
 
         }
 
+        private void nud_apply_profile_count_ValueChanged(object sender, EventArgs e)
+        {
+            _profileSettingChanged = true;
+            if (nud_apply_profile_count.Value > 1)
+            {
+                lbl_apply_profile_delay.Visible = true;
+                nud_apply_profile_delay.Visible = true;
+                lbl_seconds.Visible = true;
+            }
+            else
+            {
+                lbl_apply_profile_delay.Visible = false;
+                nud_apply_profile_delay.Visible = false;
+                lbl_seconds.Visible = false;
+            }
+        }
+
+        private void nud_apply_profile_delay_ValueChanged(object sender, EventArgs e)
+        {
+            _profileSettingChanged = true;
+        }
+
     }
 }

DisplayMagician/UIForms/ProfileSettingsForm.cs

@@ -2239,6 +2239,9 @@ private void LoadShortcut()
                 // Set up capture permanance as temporary
                 _shortcutToEdit.CapturePermanence = ShortcutPermanence.Temporary;
                 rb_switch_capture_temp.Checked = true;
+
+                // Set up the Game Timeouts
+                nud_timeout_game.Value = _shortcutToEdit.StartTimeout;
             }
 
             if (shortcutTweakChangesName && cb_autosuggest.Checked)

DisplayMagician/UIForms/ShortcutForm.Designer.cs

@@ -470,7 +470,7 @@ public int ApplyProfileCount
             }
         }
 
-        // The delay in milliseconds between profile attempts. Is only used if there is more than one attempt set in ApplyProfileCount
+        // The delay in seconds between profile attempts. Is only used if there is more than one attempt set in ApplyProfileCount
         [DefaultValue(0)]
         public int ApplyProfileDelay
         {

DisplayMagician/UIForms/ShortcutForm.cs

@@ -1580,10 +1580,11 @@ public static ApplyProfileResult ApplyProfile(ProfileItem profile)
                         result = ApplyProfileResult.Successful;
                     }
 
-                    if (i > 1 && profile.ApplyProfileDelay > 0 && profile.ApplyProfileDelay < 99999)
+                    if (i > 1 && profile.ApplyProfileDelay > 0 && profile.ApplyProfileDelay <= 1000)
                     {
-                        // we have more than one profile attempt to go, so delay the requested amount
-                        Task.Delay(profile.ApplyProfileDelay);
+                        // we have more than one profile attempt to go, so delay the requested amount, converting seconds to milliseconds.
+                        // Note - usiong THread.Sleep instead of Task.Delay, as this is not a UI thread and we want to delay this thread.
+                        Thread.Sleep(profile.ApplyProfileDelay * 1000);
                     }
                 }
             }

DisplayMagicianShared/ProfileItem.cs

@@ -1629,7 +1629,7 @@ public bool SetActiveConfig(WINDOWS_DISPLAY_CONFIG displayConfig)
 
 
             // Wait 0.5 second for the display to settle before trying the CCD settings. This hopefully will make it more reliable setting the primary display as described in issues #78 and #284
-            Task.Delay(500);
+            Task.Delay(500).Wait();
 
 
             uint myPathsCount = (uint)displayConfig.DisplayConfigPaths.Length;