Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 796733 - Re-order the calling sequence of disable FM radio and change audio state. r=mwu

Browse Source
This commit is contained in:
Steven Lee 2012-10-11 21:31:39 -04:00
parent f0423b1f36
commit 9be044e05a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/fm/FMRadio.cpp
View File

@ -144,14 +144,16 @@ NS_IMETHODIMP FMRadio::Enable(nsIFMRadioSettings *settings)
/* void disableRadio (); */
NS_IMETHODIMP FMRadio::Disable()
{
// Fix Bug 796733.
// DisableFMRadio should be called before SetFmRadioAudioEnabled to prevent
// the annoying beep sound.
DisableFMRadio();
nsCOMPtr<nsIAudioManager> audioManager =
do_GetService(NS_AUDIOMANAGER_CONTRACTID);
NS_ENSURE_TRUE(audioManager, NS_OK);
audioManager->SetFmRadioAudioEnabled(false);
DisableFMRadio();
return NS_OK;
}