diff --git a/xbmc/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp
index 5551f7a..b0bfc80 100644
--- a/xbmc/ApplicationMessenger.cpp
+++ b/xbmc/ApplicationMessenger.cpp
@@ -940,14 +940,14 @@ void CApplicationMessenger::MediaPlay(int playlistid, int song /* = -1 */)
   SendMessage(tMsg, true);
 }

-void CApplicationMessenger::PlayFile(const CFileItem &item, bool bRestart /*= false*/)
+void CApplicationMessenger::PlayFile(const CFileItem &item, bool bRestart /*= false*/, bool bWait /*= false*/)
 {
   ThreadMessage tMsg = {TMSG_MEDIA_PLAY};
   CFileItem *pItem = new CFileItem(item);
   tMsg.lpVoid = (void *)pItem;
   tMsg.param1 = bRestart ? 1 : 0;
   tMsg.param2 = 0;
-  SendMessage(tMsg, false);
+  SendMessage(tMsg, bWait);
 }

 void CApplicationMessenger::MediaStop(bool bWait /* = true */, int playlistid /* = -1 */)
diff --git a/xbmc/ApplicationMessenger.h b/xbmc/ApplicationMessenger.h
index 1ff19ab..3ba842c 100644
--- a/xbmc/ApplicationMessenger.h
+++ b/xbmc/ApplicationMessenger.h
@@ -193,7 +193,7 @@ public:
   void PlayListPlayerSwap(int playlist, int indexItem1, int indexItem2);
   void PlayListPlayerRepeat(int playlist, int repeatState);

-  void PlayFile(const CFileItem &item, bool bRestart = false); // thread safe version of g_application.PlayFile()
+  void PlayFile(const CFileItem &item, bool bRestart = false, bool bWait = false); // thread safe version of g_application.PlayFile()
   void PictureShow(std::string filename);
   void PictureSlideShow(std::string pathname, bool addTBN = false);
   void SetGUILanguage(const std::string &strLanguage);
diff --git a/xbmc/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp
index 1ba4136..f004afe 100644
--- a/xbmc/network/AirTunesServer.cpp
+++ b/xbmc/network/AirTunesServer.cpp
@@ -228,7 +228,7 @@ void* CAirTunesServer::AudioOutputFunctions::audio_init(void *cls, int bits, int
   item.SetMimeType("audio/x-xbmc-pcm");
   m_streamStarted = true;

-  CApplicationMessenger::Get().PlayFile(item);
+  CApplicationMessenger::Get().PlayFile(item, false, true);//sync call

   return session;//session
 }