From 9278a1851b473e8615634d7bc77b2a92e1e6c212 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Fri, 14 Mar 2014 19:46:44 +0000
Subject: [PATCH] [Change] Better handling of player_flags and sunds when
 exiting the game.

---
 src/menu.c   | 5 +++++
 src/player.c | 8 ++------
 src/player.h | 1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/menu.c b/src/menu.c
index cdd299f..94375a2 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -250,6 +250,11 @@ static void menu_small_exit(unsigned int wid, char* str) {
     menu_Close(MENU_INFO);
   }
 
+  /* Stop player sounds because they sometimes hand! */
+  player_flags = 0;
+  player_stopSound();
+
+  /* Clean up. */
   window_destroy(wid);
   menu_Close(MENU_SMALL);
   menu_main();
diff --git a/src/player.c b/src/player.c
index 13a0df7..cff1665 100644
--- a/src/player.c
+++ b/src/player.c
@@ -199,7 +199,6 @@ static int player_newMake(void);
 static void player_newShipMake(char* name);
 /* Sound. */
 static void player_initSound(void);
-/*static void player_stopSound(void) */
 /* Gui. */
 static void rect_parse(const xmlNodePtr parent,
                        double* x, double* y, double* w, double* h);
@@ -655,16 +654,13 @@ void player_playSound(int sound, int once) {
   sound_playGroup(PLAYER_GUI_CHANNEL, sound, once);
 }
 
-#if 0
 /**
- * @fn static void player_stopSound(void)
- *
  * @brief Stop playing player sounds.
  */
-static void player_stopSound(void) {
+void player_stopSound(void) {
   sound_stopGroup(PLAYER_GUI_CHANNEL);
+  sound_stopGroup(PLAYER_ENGINE_CHANNEL);
 }
-#endif
 
 /**
  * @fn void player_message(const char* fmt, ...)
diff --git a/src/player.h b/src/player.h
index b291c83..958554b 100644
--- a/src/player.h
+++ b/src/player.h
@@ -52,6 +52,7 @@ void player_clear(void);
 void player_warp(const double x, const double y);
 const char* player_rating(void);
 void player_playSound(int sound, int once);
+void player_stopSound(void);
 /* Cargo. */
 int player_outfitOwned(const char* outfitname);
 int player_cargoOwned(const char* commodityname);