chiark / gitweb /
Fix user defined quickprint profiles. 15.01-RC6
authordaid <daid303@gmail.com>
Fri, 2 Jan 2015 13:04:08 +0000 (14:04 +0100)
committerdaid <daid303@gmail.com>
Fri, 2 Jan 2015 13:04:08 +0000 (14:04 +0100)
Cura/util/resources.py

index 0259ef97f64d2ae50ea3417a34eb1afb14199c51..305cc4b174035c8dfc0f48b91a940f39f5572d6c 100644 (file)
@@ -53,14 +53,18 @@ def getSimpleModeProfiles():
        path = os.path.normpath(os.path.join(resourceBasePath, 'quickprint', 'profiles', '*.ini'))
        user_path = os.path.normpath(os.path.expanduser(os.path.join('~', '.Cura', 'quickprint', 'profiles')))
        if os.path.isdir(user_path):
-               return sorted(glob.glob(user_path))
+               files = sorted(glob.glob(os.path.join(user_path, '*.ini')))
+               if len(files) > 0:
+                       return files
        return sorted(glob.glob(path))
 
 def getSimpleModeMaterials():
        path = os.path.normpath(os.path.join(resourceBasePath, 'quickprint', 'materials', '*.ini'))
        user_path = os.path.normpath(os.path.expanduser(os.path.join('~', '.Cura', 'quickprint', 'materials')))
        if os.path.isdir(user_path):
-               return sorted(glob.glob(user_path))
+               files = sorted(glob.glob(os.path.join(user_path, '*.ini')))
+               if len(files) > 0:
+                       return files
        return sorted(glob.glob(path))
 
 def setupLocalization(selectedLanguage = None):