Merge pull request #735 from FernetMenta/mainline2

linux: disable gui sounds before starting player
xbmc · Mar 9, 2012 · 714b560 · 714b560
2 parents 2e1548f + bb4245c
commit 714b560
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -3804,7 +3804,7 @@ bool CApplication::PlayFile(const CFileItem& item, bool bRestart)
 
   // Workaround for bug/quirk in SDL_Mixer on OSX.
   // TODO: Remove after GUI Sounds redux
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(_LINUX)
   g_audioManager.Enable(false);
 #endif
 
@@ -3868,7 +3868,7 @@ bool CApplication::PlayFile(const CFileItem& item, bool bRestart)
     }
 #endif
 
-#if !defined(__APPLE__)
+#if !defined(__APPLE__) && !defined(_LINUX)
     g_audioManager.Enable(false);
 #endif
   }