Skip to content

Commit

Permalink
Revert "[AE] volume: don't unmute when altering volume while muted"
Browse files Browse the repository at this point in the history
This reverts commit 66d95e0.

Conflicts:

	xbmc/Application.cpp
  • Loading branch information
Jonathan Marshall committed May 6, 2012
1 parent af3cfe5 commit 63e6ebc
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions xbmc/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2634,6 +2634,8 @@ bool CApplication::OnAction(const CAction &action)
{
if (!m_pPlayer || !m_pPlayer->IsPassthrough())
{
if (g_settings.m_bMute)
UnMute();
float volume = g_settings.m_fVolumeLevel;
float step = (VOLUME_MAXIMUM - VOLUME_MINIMUM) / VOLUME_CONTROL_STEPS;
if (action.GetRepeat())
Expand Down

0 comments on commit 63e6ebc

Please sign in to comment.