aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-03-21 06:17:32 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-03-21 06:17:32 +0000
commit09880de539b1cf418f42ff8dc8159ef98e41c832 (patch)
treea5876794af58d97b040283ca7701ad3239adaa32 /src
parent445d807b9cdd32619bee42339315b7e83d18eaca (diff)
downloadmpd-09880de539b1cf418f42ff8dc8159ef98e41c832.tar.gz
mpd-09880de539b1cf418f42ff8dc8159ef98e41c832.tar.xz
mpd-09880de539b1cf418f42ff8dc8159ef98e41c832.zip
fix for iconv
git-svn-id: https://svn.musicpd.org/mpd/trunk@339 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src')
-rw-r--r--src/audio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/audio.c b/src/audio.c
index 713519f5c..3e61a6548 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -116,7 +116,7 @@ void finishAudioDriver() {
}
int isCurrentAudioFormat(AudioFormat * audioFormat) {
- if(!audio_device) return 0;
+ if(!audio_device || !audioFormat) return 0;
if(audio_format.bits!=audioFormat->bits ||
audio_format.sampleRate!=audioFormat->sampleRate ||
@@ -131,7 +131,7 @@ int isCurrentAudioFormat(AudioFormat * audioFormat) {
int initAudio(AudioFormat * audioFormat) {
ao_sample_format format;
- if(audioFormat && audio_device && !isCurrentAudioFormat(audioFormat)) {
+ if(audio_device && !isCurrentAudioFormat(audioFormat)) {
finishAudio();
}