Merge branch 'qt_ui' of https://github.com/shdwp/dcs_liberation into qt_ui

qt_ui/main.py

@@ -19,8 +19,17 @@ if __name__ == "__main__":
     assert len(sys.argv) >= 3, "__init__.py should be started with two mandatory arguments: %UserProfile% location and application version"
 
     persistency.setup(sys.argv[1])
+    source_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..\\resources\\payloads")
+    compiled_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..\\resources\\payloads")
+    the_path = None
+    if os.path.exists(source_path):
+        the_path = source_path
+    else:
+        the_path = compiled_path
+
     dcs.planes.FlyingType.payload_dirs = [
-        os.path.join(os.path.dirname(os.path.realpath(__file__)), "..\\resources\\payloads")]
+        the_path
+    ]
 
     VERSION_STRING = sys.argv[2]
     logging_module.setup_version_string(VERSION_STRING)

userdata/persistency.py

@@ -18,7 +18,6 @@ def base_path() -> str:
     global _user_folder
     assert _user_folder
 
-    return installation.get_dcs_saved_games_directory()
     openbeta_path = os.path.join(_user_folder, "DCS.openbeta")
     if "--force-stable-DCS" not in sys.argv and os.path.exists(openbeta_path):
         return openbeta_path