From a763848644917aa77a915ee7a8b06031db1e1c4b Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Sun, 13 Feb 2011 18:19:37 +0100
Subject: [PATCH] Fix some issues with message queues.

---
 netplay.h | 4 ----
 ssnes.c   | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/netplay.h b/netplay.h
index 7760b1a11f..f5877e4d55 100644
--- a/netplay.h
+++ b/netplay.h
@@ -52,8 +52,4 @@ int16_t netplay_input_state(netplay_t *handle, bool port, unsigned device, unsig
 // bool netplay_should_skip(netplay_t *handle);
 const struct snes_callbacks* netplay_callbacks(netplay_t *handle);
 
-
-
-
-
 #endif
diff --git a/ssnes.c b/ssnes.c
index cdc7cc69f3..c55279304d 100644
--- a/ssnes.c
+++ b/ssnes.c
@@ -1194,6 +1194,7 @@ int main(int argc, char *argv[])
    if (!init_rom_file(g_extern.game_type))
       goto error;
 
+   init_msg_queue();
    init_movie();
 
    if (!g_extern.bsv_movie)
@@ -1202,15 +1203,14 @@ int main(int argc, char *argv[])
       init_rewind();
    }
 
-   init_drivers();
    init_netplay();
+   init_drivers();
 
    psnes_set_video_refresh(g_extern.netplay ? video_frame_net : video_frame);
    psnes_set_audio_sample(g_extern.netplay ? audio_sample_net : audio_sample);
    psnes_set_input_poll(g_extern.netplay ? input_poll_net : input_poll);
    psnes_set_input_state(g_extern.netplay ? input_state_net : input_state);
    
-   init_msg_queue();
    init_controllers();
    
 #ifdef HAVE_FFMPEG