Merge pull request #387 from emoacht/develop

Develop
emoacht · Dec 15, 2022 · d9730e2 · d9730e2
2 parents eca288a + e946a5c
commit d9730e2
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="3.15.2"
+  <Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="3.15.3"
            Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
     <Package Id="*" InstallerVersion="500" Compressed="yes"
              InstallScope="perMachine" InstallPrivileges="elevated"

diff --git a/Source/Monitorian.Core/AppControllerCore.cs b/Source/Monitorian.Core/AppControllerCore.cs
@@ -208,11 +208,16 @@ protected virtual async void OnSettingsChanged(object sender, PropertyChangedEve
 
 		#region Monitors
 
-		protected virtual async void OnMonitorsChangeInferred(object sender = null, ICountEventArgs e = null)
+		protected virtual async void OnMonitorsChangeInferred(object sender, ICountEventArgs e = null)
 		{
 			await Recorder.RecordAsync($"{nameof(OnMonitorsChangeInferred)} ({sender}{e?.Description})");
 
-			if (e?.Count == 0)
+			await ProceedScanAsync(e);
+		}
+
+		protected virtual async Task ProceedScanAsync(ICountEventArgs e)
+		{
+			if (e is { Count: 0 })
 				return;
 
 			await ScanAsync(TimeSpan.FromSeconds(3));

diff --git a/Source/Monitorian.Core/Models/Watcher/DisplayWatcher.cs b/Source/Monitorian.Core/Models/Watcher/DisplayWatcher.cs
@@ -11,7 +11,7 @@ internal class DisplayWatcher : TimerWatcher
 	{
 		private Action<ICountEventArgs> _onDisplaySettingsChanged;
 
-		public DisplayWatcher() : base(1, 4, 5)
+		public DisplayWatcher() : base(1, 4, 5, 10)
 		{ }
 
 		public void Subscribe(Action<ICountEventArgs> onDisplaySettingsChanged)

diff --git a/Source/Monitorian.Core/Models/Watcher/PowerWatcher.cs b/Source/Monitorian.Core/Models/Watcher/PowerWatcher.cs
@@ -85,7 +85,8 @@ private void OnDisplayStateChanged(DisplayStates state)
 		{
 			switch (state)
 			{
-				case DisplayStates.On or DisplayStates.Dimmed:
+				case DisplayStates.On:
+				case DisplayStates.Dimmed:
 					RaiseDisplayStateChanged(state, 0);
 					_stateWatcher.TimerStart(state);
 					break;

diff --git a/Source/Monitorian.Core/Models/Watcher/TimerWatcher.cs b/Source/Monitorian.Core/Models/Watcher/TimerWatcher.cs
@@ -18,7 +18,7 @@ internal abstract class TimerWatcher : IDisposable
 		/// <param name="intervals">Sequence of timer intervals in seconds</param>
 		protected TimerWatcher(params int[] intervals)
 		{
-			if (intervals?.Length is not > 0)
+			if (intervals is not { Length: > 0 })
 				throw new ArgumentNullException(nameof(intervals));
 			if (intervals.Any(x => x <= 0))
 				throw new ArgumentOutOfRangeException(nameof(intervals), intervals.First(x => x <= 0), "An interval must be positive.");

diff --git a/Source/Monitorian.Core/Properties/AssemblyInfo.cs b/Source/Monitorian.Core/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.15.2.0")]
-[assembly: AssemblyFileVersion("3.15.2.0")]
+[assembly: AssemblyVersion("3.15.3.0")]
+[assembly: AssemblyFileVersion("3.15.3.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // For unit test

diff --git a/Source/Monitorian.Core/Views/Input/Touchpad/TouchpadTracker.cs b/Source/Monitorian.Core/Views/Input/Touchpad/TouchpadTracker.cs
@@ -53,7 +53,7 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
 			{
 				case TouchpadHelper.WM_INPUT:
 					var contacts = TouchpadHelper.ParseInput(lParam);
-					if (contacts?.Length > 1)
+					if (contacts is { Length: > 1 })
 					{
 						Check(contacts[0]);
 						handled = true;

diff --git a/Source/Monitorian/Properties/AssemblyInfo.cs b/Source/Monitorian/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.15.2.0")]
-[assembly: AssemblyFileVersion("3.15.2.0")]
+[assembly: AssemblyVersion("3.15.3.0")]
+[assembly: AssemblyFileVersion("3.15.3.0")]
 [assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
 [assembly: NeutralResourcesLanguage("en-US")]