Permalink
Browse files

Revert "[AE] volume: don't unmute when altering volume while muted"

This reverts commit 66d95e0.

Conflicts:

	xbmc/Application.cpp
  • Loading branch information...
1 parent af3cfe5 commit 63e6ebc2c568667d3ef1d9fa0ba280071d4b3703 Jonathan Marshall committed May 6, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0 xbmc/Application.cpp
View
@@ -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())

0 comments on commit 63e6ebc

Please sign in to comment.