Merge pull request #45 from Rexeh/Hotfix

Hotfix - DCS Folder Crash
Rexeh · Jan 23, 2021 · 943ff6c · 943ff6c
2 parents 62b23c6 + b3841d6
commit 943ff6c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@ __pycache__/
 src/__pycache__
 src/adaptors/__pycache__/
 src/functions/__pycache__/
-tests/__pycache__/*
+tests/__pycache__
 tests/*/__pycache__/
 *.code-workspace
 .vscode/
@@ -13,5 +13,5 @@ tests/*/__pycache__/
 temp/
 diagrams/*.svg
 play*.py
-tests/__pycache__/test_helpers.cpython-38-pytest-6.0.2.pyc
+tests/__pycache__/*.pyc
 untitled.ui
diff --git a/setup.py b/setup.py
@@ -32,7 +32,7 @@
 
 setup(
     name='Joystick Diagrams',
-    version='1.0.0',
+    version='1.2.1',
     description='Automatically create diagrams for your throttles, joysticks and custom HID devices',
     long_description=long_description,
     long_description_content_type='text/markdown',

diff --git a/src/adaptors/dcs_world.py b/src/adaptors/dcs_world.py
@@ -53,7 +53,8 @@ def __validateProfile(self, item):
         Return Valid Profile
         '''
         #TODO add additional checking for rogue dirs/no files etc
-        if 'joystick' in os.listdir(os.path.join(self.path, 'Config', 'Input', item)):
+
+        if os.path.isdir(os.path.join(self.path, 'Config', 'Input', item)) and 'joystick' in os.listdir(os.path.join(self.path, 'Config', 'Input', item)):
             return os.listdir(os.path.join(self.path, 'Config', 'Input', item, 'joystick'))
         else:
             return False

diff --git a/src/version.py b/src/version.py
@@ -1 +1 @@
-VERSION = "1.2.0"
+VERSION = "1.2.1"