Fix crash in EventScheduler when number of monitors has increased

t1m0thyj · t1m0thyj · commit f533006de1d8 · 2024-08-21T21:11:51.000-04:00
diff --git a/src/EventScheduler.cs b/src/EventScheduler.cs
@@ -7,7 +7,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace WinDynamicDesktop
@@ -82,7 +81,8 @@ public bool Run(bool forceImageUpdate = false, DisplayEvent overrideEvent = null
                 if (i < displayEvents.Count - 1)
                 {
                     string themeId = JsonConfig.settings.activeThemes[0];
-                    if (themeId == null && JsonConfig.settings.activeThemes.Length > 1)
+                    if (themeId == null && JsonConfig.settings.activeThemes.Length > 1 &&
+                        i + 1 < JsonConfig.settings.activeThemes.Length)
                     {
                         themeId = JsonConfig.settings.activeThemes[i + 1];
                     }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`using System.Collections.Generic;`
`8`	`8`	`using System.IO;`
`9`	`9`	`using System.Linq;`
`10`		`-using System.Threading.Tasks;`
`11`	`10`	`using System.Windows.Forms;`
`12`	`11`
`13`	`12`	`namespace WinDynamicDesktop`
`@@ -82,7 +81,8 @@ public bool Run(bool forceImageUpdate = false, DisplayEvent overrideEvent = null`
`82`	`81`	`if (i < displayEvents.Count - 1)`
`83`	`82`	`{`
`84`	`83`	`string themeId = JsonConfig.settings.activeThemes[0];`
`85`		`- if (themeId == null && JsonConfig.settings.activeThemes.Length > 1)`
	`84`	`+ if (themeId == null && JsonConfig.settings.activeThemes.Length > 1 &&`
	`85`	`+ i + 1 < JsonConfig.settings.activeThemes.Length)`
`86`	`86`	`{`
`87`	`87`	`themeId = JsonConfig.settings.activeThemes[i + 1];`
`88`	`88`	`}`