Logitech LCD: Correctly initialize the volume at start-up.

Fixes #4086.

2 files changed, 4 insertions, 1 deletions

diff --git a/docs/Changelog.txt b/docs/Changelog.txt
index 0b4d0df2b..f39a0e4ac 100644
--- a/docs/Changelog.txt
+++ b/docs/Changelog.txt
@@ -33,6 +33,7 @@ next version - not released yet
   Romanian, Russian, Slovak, Spanish, Swedish, Thai, Turkish and Vietnamese translations

 ! Fix a rare crash when exiting DVB mode

 ! Quicktime: Fix a crash when using system default renderer

+! Ticket #4086, Logitech LCD: Correctly initialize the volume at start-up

 ! Ticket #5454, Deleting an item from the playlist sometimes did not work when shuffle mode was enabled

 ! Ticket #5464, If the main window was minimized while the D3D fullscreen window was displayed on another screen,

   it was impossible to use the mouse buttons to play, pause, exit fullscreen, etc.

diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp
index c95fbac64..c2f075e2d 100644
--- a/src/mpc-hc/MainFrm.cpp
+++ b/src/mpc-hc/MainFrm.cpp
@@ -785,7 +785,6 @@ CMainFrame::CMainFrame()
     , m_bExtOnTop(false)

     , m_bIsBDPlay(false)

 {

-    m_Lcd.SetVolumeRange(0, 100);

     // Don't let CFrameWnd handle automatically the state of the menu items.

     // This means that menu items without handlers won't be automatically

     // disabled but it avoids some unwanted cases where programmatically

@@ -932,6 +931,9 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 

     ShowTrayIcon(s.fTrayIcon);

 

+    m_Lcd.SetVolumeRange(0, 100);

+    m_Lcd.SetVolume(std::max(1, s.nVolume));

+

     m_pGraphThread = (CGraphThread*)AfxBeginThread(RUNTIME_CLASS(CGraphThread));

 

     if (m_pGraphThread) {