2 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0cfbbaf..f9ecbc3 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,10 @@
 2009-04-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        LLMediaImplGStreamer::play() is no-op if already playing.
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
         Removed some useless code from LLMediaImplGStreamer::startPlay().
 
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 5cf7eed..3fd6d6e 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -792,6 +792,13 @@ bool LLMediaImplGStreamer::play()
         if (!mPlaybin || mState == GST_STATE_NULL)
                 return true;
 
+
+        if( getState() == GST_STATE_PLAYING )
+        {
+                LL_DEBUGS("MediaImpl") << "... but already playing." << LL_ENDL;
+                return true;
+        }
+
         // Clean up the existing thread, if any.
         if( mPlayThread != NULL && mPlayThread->isStopped())
         {