From fdfc55c8fdc70771dc5cc6af53db5a711200490f Mon Sep 17 00:00:00 2001
From: gibbed <rick@gibbed.us>
Date: Sun, 12 Apr 2020 16:06:17 -0500
Subject: [PATCH] [App] Support a relative content path.

---
 src/xenia/app/xenia_main.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/xenia/app/xenia_main.cc b/src/xenia/app/xenia_main.cc
index 2efe2b358..50bfb24e0 100644
--- a/src/xenia/app/xenia_main.cc
+++ b/src/xenia/app/xenia_main.cc
@@ -233,6 +233,12 @@ int xenia_main(const std::vector<std::string>& args) {
   std::filesystem::path content_root = cvars::content_root;
   if (content_root.empty()) {
     content_root = storage_root / "content";
+  } else {
+    // If content root isn't an absolute path, then it should be relative to the
+    // storage root.
+    if (!content_root.is_absolute()) {
+      content_root = storage_root / content_root;
+    }
   }
   content_root = std::filesystem::absolute(content_root);
   XELOGI("Content root: {}", xe::path_to_utf8(content_root));