From 00081d774e077339be50c49beb838edd2b76a9b1 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Thu, 17 Jan 2008 23:34:58 +0000
Subject: [PATCH] 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
---
 src/as/com/threerings/flash/MediaContainer.as | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/as/com/threerings/flash/MediaContainer.as b/src/as/com/threerings/flash/MediaContainer.as
index d9a6fc34..58cc3a09 100644
--- a/src/as/com/threerings/flash/MediaContainer.as
+++ b/src/as/com/threerings/flash/MediaContainer.as
@@ -132,12 +132,12 @@ public class MediaContainer extends Sprite
         if (Util.equals(_url, url)) {
             return; // no change
         }
-        _url = url;
 
         // shutdown any previous media
         if (_media != null) {
             shutdown(false);
         }
+        _url = url;
 
         // set up the new media
         willShowNewMedia();
@@ -158,10 +158,10 @@ public class MediaContainer extends Sprite
      */
     public function setMediaObject (disp :DisplayObject) :void
     {
-        _url = null;
         if (_media != null) {
             shutdown(false);
         }
+        _url = null;
 
         willShowNewMedia();
         addChildAt(disp, 0);
@@ -310,7 +310,8 @@ public class MediaContainer extends Sprite
                 loader.unload();
 
                 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) {
                 var vid :VideoDisplayer = (_media as VideoDisplayer);