From 7993456e1705dd66c195681b7856a61c5ce6f495 Mon Sep 17 00:00:00 2001
From: lx-s <lx-s@users.noreply.github.com>
Date: Tue, 19 Dec 2023 21:09:47 +0100
Subject: [PATCH] project settings

---
 Dist/bin/changelog.txt  |  2 +-
 WinMute/TrayIcon.cpp    |  5 ++---
 WinMute/TrayIcon.h      | 12 ++++++------
 WinMute/WinMute.vcxproj |  8 ++++----
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Dist/bin/changelog.txt b/Dist/bin/changelog.txt
index dc6537a..29d1185 100644
--- a/Dist/bin/changelog.txt
+++ b/Dist/bin/changelog.txt
@@ -1,4 +1,4 @@
-Version 3.0.0 (2024-01-xx)
+Version 2.4.9 (2023-12-19)
  * WinMute now supports multiple languages!
    If your language is missing, and you want to contribute, please check
    the WinMute GitHub project.
diff --git a/WinMute/TrayIcon.cpp b/WinMute/TrayIcon.cpp
index 14de540..36c4971 100644
--- a/WinMute/TrayIcon.cpp
+++ b/WinMute/TrayIcon.cpp
@@ -33,8 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "common.h"
 
-TrayIcon::TrayIcon() :
-   initialized_(false), iconVisible_(false), trayID_(0), hIcon_(0), hWnd_(0)
+TrayIcon::TrayIcon()
 {
 }
 
@@ -42,7 +41,7 @@ TrayIcon::TrayIcon(
    HWND hWnd, UINT trayID, HICON hIcon,
    const std::wstring& tooltip, bool show,
    int callbackId)
-   : initialized_(false), iconVisible_(false), callbackId_(callbackId)
+   : callbackId_(callbackId)
 {
    Init(hWnd, trayID, hIcon, tooltip, show);
 }
diff --git a/WinMute/TrayIcon.h b/WinMute/TrayIcon.h
index 288234c..babc23e 100644
--- a/WinMute/TrayIcon.h
+++ b/WinMute/TrayIcon.h
@@ -68,11 +68,11 @@ private:
 
    mutable std::vector<TrayIconPopup> popupQueue_;
 
-   int callbackId_;
-   bool initialized_;
-   bool iconVisible_;
-   UINT trayID_;
-   HICON hIcon_;
-   HWND hWnd_;
+   int callbackId_ = WM_TRAYICON;
+   bool initialized_ = false;
+   bool iconVisible_ = false;
+   UINT trayID_ = 0;
+   HICON hIcon_ = 0;
+   HWND hWnd_ = 0;
    std::wstring tooltip_;
 };
diff --git a/WinMute/WinMute.vcxproj b/WinMute/WinMute.vcxproj
index d6eebce..1090a3b 100644
--- a/WinMute/WinMute.vcxproj
+++ b/WinMute/WinMute.vcxproj
@@ -120,7 +120,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Advapi32.lib;Winhttp.lib;Bthprops.lib;comsuppwd.lib;comctl32.lib;strsafe.lib;UxTheme.lib;Winmm.lib;Wlanapi.lib;WtsApi32.lib;Shell32.lib;Version.lib;Gdi32.lib</AdditionalDependencies>
+      <AdditionalDependencies>Winhttp.lib;Bthprops.lib;Winmm.lib;UxTheme.lib;Wlanapi.lib;comctl32.lib;WtsApi32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Manifest>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
@@ -147,7 +147,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Advapi32.lib;Winhttp.lib;Bthprops.lib;comsuppwd.lib;comctl32.lib;strsafe.lib;UxTheme.lib;Winmm.lib;Wlanapi.lib;WtsApi32.lib;Shell32.lib;Version.lib;Gdi32.lib</AdditionalDependencies>
+      <AdditionalDependencies>Winhttp.lib;Bthprops.lib;Winmm.lib;UxTheme.lib;Wlanapi.lib;comctl32.lib;WtsApi32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Manifest>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
@@ -168,7 +168,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Advapi32.lib;Winhttp.lib;Bthprops.lib;comsuppwd.lib;comctl32.lib;strsafe.lib;UxTheme.lib;Winmm.lib;Wlanapi.lib;WtsApi32.lib;Shell32.lib;Version.lib;Gdi32.lib</AdditionalDependencies>
+      <AdditionalDependencies>Winhttp.lib;Bthprops.lib;Winmm.lib;UxTheme.lib;Wlanapi.lib;comctl32.lib;WtsApi32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Manifest>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
@@ -195,7 +195,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Advapi32.lib;Winhttp.lib;Bthprops.lib;comsuppwd.lib;comctl32.lib;strsafe.lib;UxTheme.lib;Winmm.lib;Wlanapi.lib;WtsApi32.lib;Shell32.lib;Version.lib;Gdi32.lib</AdditionalDependencies>
+      <AdditionalDependencies>Winhttp.lib;Bthprops.lib;Winmm.lib;UxTheme.lib;Wlanapi.lib;comctl32.lib;WtsApi32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Manifest>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
-- 
2.43.0