Merge branch 'release/2.4.1.0'

lx-s · Sep 29, 2023 · 79548df · 79548df
2 parents 2661c48 + b9c5343
commit 79548df
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 18 deletions.
diff --git a/Dist/InnoSetup/winmute-setup.iss b/Dist/InnoSetup/winmute-setup.iss
@@ -1,5 +1,5 @@
 #define MyAppName "WinMute"
-#define MyAppVersion "2.4.0.0"
+#define MyAppVersion "2.4.1.0"
 #define MyAppPublisher "LX-Systems"
 #define MyAppURL "https://www.lx-s.de/winmute"
 #define MyAppExeName "WinMute.exe"

diff --git a/Dist/bin/changelog.txt b/Dist/bin/changelog.txt
@@ -1,3 +1,6 @@
+Version 2.4.1 (2023-09-29)
+ * Fixes crash on signout and shutdown
+
 Version 2.4.0 (2023-09-22)
  * Added the option to delay muting by a configurable amount of seconds.
 

diff --git a/Dist/bin/liesmich.html b/Dist/bin/liesmich.html
@@ -2,7 +2,7 @@
 <html lang="de">
 <head>
    <meta charset="utf-8">
-   <title>WinMute 2.4.0 - Lies mich</title>
+   <title>WinMute 2.4.1 - Lies mich</title>
 
    <style type="text/css">
    <!--
@@ -18,7 +18,7 @@
    </style>
 </head>
 <body>
-   <h1>WinMute 2.4.0</h1>
+   <h1>WinMute 2.4.1</h1>
    <p class="copyright">&copy; Copyright 2023, Alexander Steinh&ouml;fer - <a href="http://www.lx-s.de">www.lx-s.de</a></p>
 
    <h2>&Uuml;ber</h2>

diff --git a/Dist/bin/readme.html b/Dist/bin/readme.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
    <meta charset="utf-8">
-   <title>WinMute 2.4.0 - Readme</title>
+   <title>WinMute 2.4.1 - Readme</title>
 
    <style type="text/css">
    <!--
@@ -18,7 +18,7 @@
    </style>
 </head>
 <body>
-   <h1>WinMute 2.4.0</h1>
+   <h1>WinMute 2.4.1</h1>
    <p class="copyright">&copy; Copyright 2023, by Alexander Steinh&ouml;fer - <a href="http://www.lx-s.de">www.lx-s.de</a></p>
 
    <h2>About</h2>

diff --git a/Dist/chocolatey/WinMute.nuspec b/Dist/chocolatey/WinMute.nuspec
@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
 	<metadata>
 		<id>winmute</id>
-		<version>2.4.0.2023092201</version>
+		<version>2.4.1.2023092901</version>
 		<title>WinMute</title>
 		<authors>Alexander Steinhöfer</authors>
 		<owners>Alexander Steinhöfer</owners>
@@ -16,7 +16,7 @@
 		<summary>Automatic sound muter</summary>
 		<description>WinMute automatically mutes your PC volume if you lock your screen or the screensaver is running.</description>
 		<copyright>© 2023 Alexander Steinhöfer</copyright>
-		<releaseNotes>https://github.com/lx-s/WinMute/releases/tag/2.4.0.0</releaseNotes>
+		<releaseNotes>https://github.com/lx-s/WinMute/releases/tag/2.4.1.0</releaseNotes>
 		<licenseUrl>https://raw.githubusercontent.com/lx-s/WinMute/main/LICENSE</licenseUrl>
 		<dependencies>
 			<dependency id="vcredist140" version="14.3"/>

diff --git a/WinMute/MuteControl.cpp b/WinMute/MuteControl.cpp
@@ -68,7 +68,7 @@ static LRESULT CALLBACK MuteControlWndProc(
    WPARAM wParam,
    LPARAM lParam)
 {
-   auto wm = reinterpret_cast<WinMute *>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
+   auto wm = reinterpret_cast<MuteControl*>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
    switch (msg) {
    case WM_NCCREATE:
    {

diff --git a/WinMute/WinMute.cpp b/WinMute/WinMute.cpp
@@ -542,10 +542,14 @@ LRESULT CALLBACK WinMute::WindowProc(
       }
       return TRUE;
    case WM_QUERYENDSESSION:
-      if (lParam == 0) { // Shutdown
-         muteCtrl_.NotifyShutdown();
-      } else if ((lParam & ENDSESSION_LOGOFF)) {
-         muteCtrl_.NotifyLogout();
+      return TRUE;
+   case WM_ENDSESSION:
+      if (wParam == TRUE) {
+         if (lParam == 0) { // Shutdown
+            muteCtrl_.NotifyShutdown();
+         } else if ((lParam & ENDSESSION_LOGOFF)) {
+            muteCtrl_.NotifyLogout();
+         }
       }
       break;
    case WM_WINMUTE_QUIETHOURS_START:

diff --git a/WinMute/WinMute.rc b/WinMute/WinMute.rc
@@ -479,8 +479,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,0,0
- PRODUCTVERSION 2,4,0,0
+ FILEVERSION 2,4,1,0
+ PRODUCTVERSION 2,4,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -497,23 +497,23 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "LX-Systems"
             VALUE "FileDescription", "WinMute"
-            VALUE "FileVersion", "2.4.0.0"
+            VALUE "FileVersion", "2.4.1.0"
             VALUE "InternalName", "WinMute.exe"
             VALUE "LegalCopyright", "Copyright (C) 2023, Alexander Steinhoefer"
             VALUE "OriginalFilename", "WinMute.exe"
             VALUE "ProductName", "WinMute"
-            VALUE "ProductVersion", "2.4.0.0"
+            VALUE "ProductVersion", "2.4.1.0"
         END
         BLOCK "040704b0"
         BEGIN
             VALUE "CompanyName", "LX-Systems"
             VALUE "FileDescription", "WinMute"
-            VALUE "FileVersion", "2.4.0.0"
+            VALUE "FileVersion", "2.4.1.0"
             VALUE "InternalName", "WinMute.exe"
             VALUE "LegalCopyright", "Copyright (C) 2023, Alexander Steinhoefer"
             VALUE "OriginalFilename", "WinMute.exe"
             VALUE "ProductName", "WinMute"
-            VALUE "ProductVersion", "2.4.0.0"
+            VALUE "ProductVersion", "2.4.1.0"
         END
     END
     BLOCK "VarFileInfo"