From 2c0fd6101bcd3fdb8e73c6ae3b2c5cc6596ff3d6 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Mon, 15 Jul 2013 16:03:35 -0400
Subject: [PATCH] * #26839: preferences: fix preprocessor logic

---
 daemon/src/preferences.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/daemon/src/preferences.cpp b/daemon/src/preferences.cpp
index fd9b5b2f64..3c459e23d2 100644
--- a/daemon/src/preferences.cpp
+++ b/daemon/src/preferences.cpp
@@ -322,7 +322,8 @@ AudioLayer* AudioPreference::createAudioLayer()
 {
 #ifdef __ANDROID__
     return new OpenSLLayer();
-#else
+#endif
+
 #if HAVE_PULSE
     if (audioApi_ == PULSEAUDIO_API_STR) {
         if (system("pactl info > /dev/null") == 0)
@@ -330,7 +331,9 @@ AudioLayer* AudioPreference::createAudioLayer()
         else
             WARN("pulseaudio daemon not running, falling back to ALSA");
     }
-#elif HAVE_ALSA
+#endif
+
+#if HAVE_ALSA
 
     audioApi_ = ALSA_API_STR;
     checkSoundCard(alsaCardin_, AudioLayer::SFL_PCM_CAPTURE);
@@ -339,8 +342,7 @@ AudioLayer* AudioPreference::createAudioLayer()
 
     return new AlsaLayer(*this);
 #else
-	return NULL;
-#endif
+    return NULL;
 #endif
 }
 
-- 
GitLab