From 188b4195867e5fcc2ed9f63fa6b10485fd15164f Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Mon, 16 Mar 2015 02:22:59 +0100
Subject: [PATCH] Common: Fix logic for setting EMU_DATA_DIR.
---
src/common/common_paths.h | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/common/common_paths.h b/src/common/common_paths.h
index eb43d589f3..440b060601 100644
--- a/src/common/common_paths.h
+++ b/src/common/common_paths.h
@@ -17,13 +17,12 @@
// The user data dir
#define ROOT_DIR "."
-#ifdef _WIN32
- #define USERDATA_DIR "user"
- #define EMU_DATA_DIR "Citra Emulator"
+#define USERDATA_DIR "user"
+#ifdef USER_DIR
+ #define EMU_DATA_DIR USER_DIR
#else
- #define USERDATA_DIR "user"
- #ifdef USER_DIR
- #define EMU_DATA_DIR USER_DIR
+ #ifdef _WIN32
+ #define EMU_DATA_DIR "Citra Emulator"
#else
#define EMU_DATA_DIR "citra-emu"
#endif
--
GitLab