From 42c8b2f989b4691b92abd282f1a00d47c55eefdc Mon Sep 17 00:00:00 2001
From: Vasyl Horbachenko <vasyl.horbachenko@gmail.com>
Date: Wed, 4 Jul 2018 03:07:32 +0300
Subject: [PATCH] hotfix for openbeta DCS saves

---
 userdata/debriefing.py  |  4 +++-
 userdata/persistency.py | 14 +++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/userdata/debriefing.py b/userdata/debriefing.py
index 2a247174..73ab30aa 100644
--- a/userdata/debriefing.py
+++ b/userdata/debriefing.py
@@ -14,6 +14,8 @@ from dcs.unit import UnitType
 
 from game import db
 
+from .persistency import _base_path
+
 DEBRIEFING_LOG_EXTENSION = "log"
 
 
@@ -92,7 +94,7 @@ class Debriefing:
 
 
 def debriefing_directory_location() -> str:
-    return os.path.expanduser("~\Saved Games\DCS\liberation_debriefings")
+    return os.path.join(_base_path(), "liberation_debriefings")
 
 
 def _logfiles_snapshot() -> typing.Dict[str, float]:
diff --git a/userdata/persistency.py b/userdata/persistency.py
index faca1396..25f78d93 100644
--- a/userdata/persistency.py
+++ b/userdata/persistency.py
@@ -4,12 +4,20 @@ import os
 import shutil
 
 
+def _base_path() -> str:
+    openbeta_path = os.path.expanduser("~\Saved Games\DCS.openbeta")
+    if os.path.exists(openbeta_path):
+        return openbeta_path
+    else:
+        return os.path.expanduser("~\Saved Games\DCS")
+
+
 def _save_file() -> str:
-    return os.path.expanduser("~\Saved Games\DCS\liberation_save")
+    return os.path.join(_base_path(), "liberation_save")
 
 
 def _temporary_save_file() -> str:
-    return os.path.expanduser("~\Saved Games\DCS\liberation_save_tmp")
+    return os.path.join(_base_path(), "liberation_save_tmp")
 
 
 def _save_file_exists() -> bool:
@@ -17,7 +25,7 @@ def _save_file_exists() -> bool:
 
 
 def mission_path_for(name: str) -> str:
-    return os.path.expanduser("~\Saved Games\DCS\Missions\{}".format(name))
+    return os.path.join(_base_path(), "Missions\{}".format(name))
 
 
 def restore_game():