Fixes based on review of #6909

svn changeset:20963/svn branch:6.7

1 files changed, 8 insertions, 1 deletions

diff --git a/src/com/vaadin/ui/AbstractMedia.java b/src/com/vaadin/ui/AbstractMedia.java
index 222c9abfa3..44f4fefcc7 100644
--- a/src/com/vaadin/ui/AbstractMedia.java
+++ b/src/com/vaadin/ui/AbstractMedia.java
@@ -6,6 +6,7 @@ package com.vaadin.ui;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import com.vaadin.terminal.PaintException;
@@ -79,7 +80,7 @@ public class AbstractMedia extends AbstractComponent {
      * @return The sources pointed to in this media.
      */
     public List<Resource> getSources() {
-        return sources;
+        return Collections.unmodifiableList(sources);
     }
 
     /**
@@ -181,6 +182,9 @@ public class AbstractMedia extends AbstractComponent {
      * Pauses the media.
      */
     public void pause() {
+        // cancel any possible play command
+        play = false;
+
         pause = true;
         requestRepaint();
     }
@@ -189,6 +193,9 @@ public class AbstractMedia extends AbstractComponent {
      * Starts playback of the media.
      */
     public void play() {
+        // cancel any possible pause command.
+        pause = false;
+
         play = true;
         requestRepaint();
     }