diff options
| author | Eugene Sandulenko | 2011-10-19 05:03:46 -0700 |
|---|---|---|
| committer | Eugene Sandulenko | 2011-10-19 05:03:46 -0700 |
| commit | 19134ecf7e543600fda7e9855ee4b3aa6822548c (patch) | |
| tree | ae2f3917075cceb3ce74c34013bd48459f384c9d /backends/platform/bada/audio.cpp | |
| parent | 84bc5651271f70e470099a19ab197ef038ef4a3b (diff) | |
| parent | ed07b99b22c2cf092f207dc15b26801c502534ac (diff) | |
| download | scummvm-rg350-19134ecf7e543600fda7e9855ee4b3aa6822548c.tar.gz scummvm-rg350-19134ecf7e543600fda7e9855ee4b3aa6822548c.tar.bz2 scummvm-rg350-19134ecf7e543600fda7e9855ee4b3aa6822548c.zip | |
Merge pull request #106 from chrisws/branch-1-4-c
BADA: Misc changes merged from appstore release
Diffstat (limited to 'backends/platform/bada/audio.cpp')
| -rw-r--r-- | backends/platform/bada/audio.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backends/platform/bada/audio.cpp b/backends/platform/bada/audio.cpp index cfa6418e08..b868e91357 100644 --- a/backends/platform/bada/audio.cpp +++ b/backends/platform/bada/audio.cpp @@ -74,7 +74,7 @@ bool AudioThread::isSilentMode() { } void AudioThread::setMute(bool on) { - if (_audioOut && !isSilentMode()) { + if (_audioOut && _timer) { _muted = on; if (on) { _timer->Cancel(); @@ -88,7 +88,7 @@ int AudioThread::setVolume(bool up, bool minMax) { int level = -1; int numLevels = sizeof(levels) / sizeof(levels[0]); - if (_audioOut && !isSilentMode()) { + if (_audioOut) { int volume = _audioOut->GetVolume(); if (minMax) { level = up ? numLevels - 1 : 0; |