From d617e50bbfe9f022e5eaf289249fd20dd3f33c84 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 9 Apr 2012 14:35:00 +0200 Subject: [PATCH] Revert "Allow for preinit of message queue." This reverts commit 7d2a00df4e1ff7599b7b14ac18eb5df896a657c7. --- general.h | 2 -- ssnes.c | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/general.h b/general.h index 51e0e54e07..2fd7c5a35d 100644 --- a/general.h +++ b/general.h @@ -463,8 +463,6 @@ void ssnes_load_state(void); void ssnes_save_state(void); void ssnes_state_slot_increase(void); void ssnes_state_slot_decrease(void); - -void ssnes_init_msg_queue(void); ///////// // Public data structures diff --git a/ssnes.c b/ssnes.c index 87d12e32dc..d047fde61f 100644 --- a/ssnes.c +++ b/ssnes.c @@ -1192,10 +1192,9 @@ static void deinit_recording(void) } #endif -void ssnes_init_msg_queue(void) +static void init_msg_queue(void) { - if (!g_extern.msg_queue) - ssnes_assert(g_extern.msg_queue = msg_queue_new(8)); + ssnes_assert(g_extern.msg_queue = msg_queue_new(8)); } static void deinit_msg_queue(void) @@ -2308,7 +2307,7 @@ int ssnes_main_init(int argc, char *argv[]) if (!init_rom_file(g_extern.game_type)) goto error; - ssnes_init_msg_queue(); + init_msg_queue(); if (!g_extern.sram_load_disable) load_save_files();