Przeglądaj źródła

wxGUI: reflect https://trac.osgeo.org/grass/changeset/63745 in standalone monitors

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63746 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 lat temu
rodzic
commit
f9d34a2e2f
1 zmienionych plików z 7 dodań i 6 usunięć
  1. 7 6
      gui/wxpython/mapdisp/main.py

+ 7 - 6
gui/wxpython/mapdisp/main.py

@@ -517,12 +517,13 @@ if __name__ == "__main__":
     # clean up GRASS env variables
     env = grass.gisenv()
     env_name = 'MONITOR_%s' % monName.upper()
+    unset = list()
     for key in env.keys():
-        if key.find(env_name) == 0:
-            RunCommand('g.gisenv',
-                       unset = '%s' % key)
-        if key == 'MONITOR' and env[key] == monName:
-            RunCommand('g.gisenv',
-                       unset = '%s' % key)
+        if key.find(env_name) == 0 or \
+           (key == 'MONITOR' and env[key] == monName):
+            unset.append(key)
+    if unset:
+        RunCommand('g.gisenv',
+                   unset = '%s' % ','.join(unset))
     
     sys.exit(0)