Fix the null reference bug. In the end, the simplist thing was to make the code match...

diff --git a/TODO.txt b/TODO.txt
index db30e11fdb8a9d8a6b22a41b863e2bd26da7aa1f..9664e616f7e8f48c4374b62c77eba6d4e1061525 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -39,7 +39,6 @@ Potlatch 2: main outstanding issues
 * The standard keyboard shortcut of cmd+z doesn't work for undo, instead it just enters a z.
 * In the advanced tag view if you use the back delete key to delete it will delete the first one or two characters and then jump to the end of the text field. (Tested in Mac OS X and Windows) (Build 24127 geowiki.com)
 * If you get a map error (e.g. too many nodes in bbox) you don't get a helpful dialog
-* Changing tags throws a null reference error (advancedTagGrid) if it's the very first thing you do.
 
 == Rendering (Halcyon) ==
 

diff --git a/net/systemeD/potlatch2/TagViewer.mxml b/net/systemeD/potlatch2/TagViewer.mxml
index 46fbb23834fcbdf85ed511e6304cb060f579d46a..4a7db5d913120de4aa2d4ab766e9c00cf75f0cf9 100644 (file)
--- a/net/systemeD/potlatch2/TagViewer.mxml
+++ b/net/systemeD/potlatch2/TagViewer.mxml
@@ -560,7 +560,9 @@
           refreshFeatureIcon();
           // if the advancedTagGrid has already been set up, it needs to be refreshed.
           // FIXME make this better, maybe advancedTagGrid should be event listening.
-          setupAdvanced(selectedEntity);
+          if(advancedContainer.initialized) {
+            checkAdvanced();
+          }
       }
 
       public function loadFeatures():void {