If shutting down media that has a different url than it should, log both urls.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@399 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
@@ -132,12 +132,12 @@ public class MediaContainer extends Sprite
|
|||||||
if (Util.equals(_url, url)) {
|
if (Util.equals(_url, url)) {
|
||||||
return; // no change
|
return; // no change
|
||||||
}
|
}
|
||||||
_url = url;
|
|
||||||
|
|
||||||
// shutdown any previous media
|
// shutdown any previous media
|
||||||
if (_media != null) {
|
if (_media != null) {
|
||||||
shutdown(false);
|
shutdown(false);
|
||||||
}
|
}
|
||||||
|
_url = url;
|
||||||
|
|
||||||
// set up the new media
|
// set up the new media
|
||||||
willShowNewMedia();
|
willShowNewMedia();
|
||||||
@@ -158,10 +158,10 @@ public class MediaContainer extends Sprite
|
|||||||
*/
|
*/
|
||||||
public function setMediaObject (disp :DisplayObject) :void
|
public function setMediaObject (disp :DisplayObject) :void
|
||||||
{
|
{
|
||||||
_url = null;
|
|
||||||
if (_media != null) {
|
if (_media != null) {
|
||||||
shutdown(false);
|
shutdown(false);
|
||||||
}
|
}
|
||||||
|
_url = null;
|
||||||
|
|
||||||
willShowNewMedia();
|
willShowNewMedia();
|
||||||
addChildAt(disp, 0);
|
addChildAt(disp, 0);
|
||||||
@@ -310,7 +310,8 @@ public class MediaContainer extends Sprite
|
|||||||
loader.unload();
|
loader.unload();
|
||||||
|
|
||||||
removeChild(loader);
|
removeChild(loader);
|
||||||
log.info("Unloaded media [url=" + url + "].");
|
var extra :String = (url == _url) ? "" : (", _url=" + _url);
|
||||||
|
log.info("Unloaded media [url=" + url + extra + "].");
|
||||||
|
|
||||||
} else if (_media is VideoDisplayer) {
|
} else if (_media is VideoDisplayer) {
|
||||||
var vid :VideoDisplayer = (_media as VideoDisplayer);
|
var vid :VideoDisplayer = (_media as VideoDisplayer);
|
||||||
|
|||||||
Reference in New Issue
Block a user