From a171f4c9fd98e48b88bd78f1af9f708dfe18bd58 Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Mon, 28 May 2012 23:14:18 +0200
Subject: [PATCH] (RARCH_CONSOLE) We want to init the message queue way before
RetroArch actually starts on consoles - therefore we add this ifdef - beats
having to add this for every console port
---
360/main.c | 2 --
ps3/main.c | 2 --
settings.c | 4 ++++
wii/main.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/360/main.c b/360/main.c
index 26bba2a760..58242aa5a1 100644
--- a/360/main.c
+++ b/360/main.c
@@ -267,8 +267,6 @@ int main(int argc, char *argv[])
rarch_main_clear_state();
config_set_defaults();
- rarch_assert(g_extern.msg_queue = msg_queue_new(8));
-
char full_path[1024];
snprintf(full_path, sizeof(full_path), "game:\\CORE.xex");
diff --git a/ps3/main.c b/ps3/main.c
index 967359359c..0d0334dafb 100644
--- a/ps3/main.c
+++ b/ps3/main.c
@@ -315,8 +315,6 @@ int main(int argc, char *argv[])
config_set_defaults();
- rarch_assert(g_extern.msg_queue = msg_queue_new(8));
-
char full_path[1024], tmp_path[1024];
snprintf(full_path, sizeof(full_path), "%s/%s/CORE.SELF", usrDirPath, EMULATOR_CORE_DIR);
snprintf(tmp_path, sizeof(tmp_path), "%s/%s/", usrDirPath, EMULATOR_CORE_DIR);
diff --git a/settings.c b/settings.c
index a5109d2b1c..e1b8f60996 100644
--- a/settings.c
+++ b/settings.c
@@ -208,6 +208,10 @@ void config_set_defaults(void)
g_settings.input.netplay_client_swap_input = netplay_client_swap_input;
for (int i = 0; i < MAX_PLAYERS; i++)
g_settings.input.joypad_map[i] = i;
+
+#ifdef RARCH_CONSOLE
+ rarch_assert(g_extern.msg_queue = msg_queue_new(8));
+#endif
}
#ifdef HAVE_CONFIGFILE
diff --git a/wii/main.c b/wii/main.c
index 9a4fb96bbc..f3de106460 100644
--- a/wii/main.c
+++ b/wii/main.c
@@ -135,7 +135,7 @@ int main(void)
log_fp = fopen("sd:/ssnes-log.txt", "w");
#endif
- rarch_assert(g_extern.msg_queue = msg_queue_new(8));
+ config_set_defaults();
wii_video_init();
input_wii.init();