瀏覽代碼

fix https://trac.osgeo.org/grass/ticket/1089
(merge https://trac.osgeo.org/grass/changeset/42583 from trunk)


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

Martin Landa 15 年之前
父節點
當前提交
39411e61f4
共有 1 個文件被更改,包括 8 次插入3 次删除
  1. 8 3
      gui/wxpython/gui_modules/menudata.py

+ 8 - 3
gui/wxpython/gui_modules/menudata.py

@@ -37,7 +37,10 @@ try:
 except ImportError:
     import elementtree.ElementTree as etree # Python <= 2.4
 
-import globalvar
+if not os.getenv("GISBASE"):
+    sys.exit("GRASS is not running. Exiting...")
+
+etcwxdir = os.path.join(os.getenv("GISBASE"), "etc", "wxpython")
 
 class MenuData:
     """!Abstract menu data class"""
@@ -192,7 +195,8 @@ class ManagerData(MenuData):
     def __init__(self, filename = None):
         if not filename:
             gisbase = os.getenv('GISBASE')
-	    filename = os.path.join(globalvar.ETCWXDIR, 'xml', 'menudata.xml')
+            global etcwxdir
+	    filename = os.path.join(etcwxdir, 'xml', 'menudata.xml')
         
         MenuData.__init__(self, filename)
         
@@ -226,7 +230,8 @@ class ModelerData(MenuData):
     def __init__(self, filename = None):
         if not filename:
             gisbase = os.getenv('GISBASE')
-	    filename = os.path.join(globalvar.ETCWXDIR, 'xml', 'menudata_modeler.xml')
+            global etcwxdir
+	    filename = os.path.join(etcwxdir, 'xml', 'menudata_modeler.xml')
         
         MenuData.__init__(self, filename)