wxGUI: fix loading workspace from running session

(merge from devbr6, https://trac.osgeo.org/grass/changeset/33028)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33029 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gui_modules/mapdisp.py

@@ -3208,8 +3208,8 @@ class MapFrame(wx.Frame):
                 self.layerbook.DeletePage(pgnum)
         
         #self.Destroy()
-
-        event.Skip()
+        if event:
+            event.Skip()
         
     def GetRender(self):
         """

gui/wxpython/wxgui.py

@@ -555,7 +555,7 @@ class GMFrame(wx.Frame):
 
         # delete current layer tree content
         self.OnWorkspaceClose()
-
+        
         self.LoadWorkspaceFile(filename)
 
         self.workspaceFile = filename
@@ -863,10 +863,10 @@ class GMFrame(wx.Frame):
         displays = []
         for page in range(0, self.gm_cb.GetPageCount()):
             displays.append(self.gm_cb.GetPage(page).maptree.mapdisplay)
-            
+        
         for display in displays:
-            display.Close()
-
+            display.OnCloseWindow(event)
+        
         self.disp_idx = 0
         self.curr_page = None