From 1b7467191b90dfdd6fda6cc6860b5b2fc1f5b273 Mon Sep 17 00:00:00 2001
From: Robert Cox <r.cox@live.co.uk>
Date: Mon, 12 Oct 2020 17:13:46 +0100
Subject: [PATCH 1/2] Update .gitignore

---
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 41aefca..41d9db8 100644
--- 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

From b3841d67ae1a0ae62fef4adf1448b8fdc13aa703 Mon Sep 17 00:00:00 2001
From: Robert Cox <r.cox@live.co.uk>
Date: Sat, 23 Jan 2021 18:46:47 +0000
Subject: [PATCH 2/2] Hotfix - DCS Input file crash

---
 setup.py                  | 2 +-
 src/adaptors/dcs_world.py | 3 ++-
 src/version.py            | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index eb7718a..d649146 100644
--- 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
index 48b43a4..9efa499 100644
--- 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
index a875311..2fbf3f7 100644
--- a/src/version.py
+++ b/src/version.py
@@ -1 +1 @@
-VERSION = "1.2.0"
\ No newline at end of file
+VERSION = "1.2.1"
\ No newline at end of file