[GRASS-SVN] r47360 - in grass/trunk: gui/wxpython/gui_modules lib/ogsf

[svn_grass at osgeo.org]

Author: annakrat
Date: 2011-08-02 14:19:28 -0700 (Tue, 02 Aug 2011)
New Revision: 47360

Modified:
   grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
   grass/trunk/lib/ogsf/gs.c
Log:
wxNviz: fix unloading maps

Modified: grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2011-08-02 20:59:11 UTC (rev 47359)
+++ grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2011-08-02 21:19:28 UTC (rev 47360)
@@ -825,7 +825,8 @@
         start = time.time()
         
         update = False
-        for layer in self.layers:
+        layersTmp = self.layers[:]
+        for layer in layersTmp:
             if layer in listOfItems:
                 continue
             ltype = self.tree.GetPyData(layer)[0]['type']

Modified: grass/trunk/lib/ogsf/gs.c
===================================================================
--- grass/trunk/lib/ogsf/gs.c	2011-08-02 20:59:11 UTC (rev 47359)
+++ grass/trunk/lib/ogsf/gs.c	2011-08-02 21:19:28 UTC (rev 47360)
@@ -572,7 +572,7 @@
 	    /* for ea att of all other surfs */
 	    for (gs = Surf_top; gs; gs = gs->next) {
 		for (j = 0; j < MAX_ATTS; j++) {
-		    if (old_datah == gs->att[j].hdata) {
+		    if ((old_datah == gs->att[j].hdata) && (fs != gs)) {
 			same = 1;
 		    }
 		}