From 09880de539b1cf418f42ff8dc8159ef98e41c832 Mon Sep 17 00:00:00 2001
From: Warren Dukes <warren.dukes@gmail.com>
Date: Sun, 21 Mar 2004 06:17:32 +0000
Subject: fix for iconv

git-svn-id: https://svn.musicpd.org/mpd/trunk@339 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/audio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/audio.c')

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();
 	}
 
-- 
cgit v1.2.3