[GRASS-SVN] r53941 - grass/branches/develbranch_6/gui/wxpython

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-11-20 10:40:59 -0800 (Tue, 20 Nov 2012)
New Revision: 53941

Modified:
   grass/branches/develbranch_6/gui/wxpython/gis_set.py
Log:
wxGUI/welcome screen: don't report error on unknown location
              (merge r53940 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gis_set.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gis_set.py	2012-11-20 18:39:34 UTC (rev 53940)
+++ grass/branches/develbranch_6/gui/wxpython/gis_set.py	2012-11-20 18:40:59 UTC (rev 53941)
@@ -212,8 +212,9 @@
         
         self.OnSetDatabase(None)
         location = self.GetRCValue("LOCATION_NAME")
-        if location == "<UNKNOWN>" or \
-                not os.path.isdir(os.path.join(self.gisdbase, location)):
+        if location == "<UNKNOWN>":
+            return
+        if os.path.isdir(os.path.join(self.gisdbase, location)):
             location = None
         
         # list of locations