From bce1019847d21b8982511fad305a4aed6bb934b9 Mon Sep 17 00:00:00 2001 From: Allanis Date: Wed, 20 Mar 2013 23:35:34 +0000 Subject: [PATCH] [Fix] Seg fault on quit before entering game. --- src/menu.h | 2 +- src/player.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/menu.h b/src/menu.h index 82c658f..7feed32 100644 --- a/src/menu.h +++ b/src/menu.h @@ -10,5 +10,5 @@ extern int menu_open; void menu_main(void); void menu_small(void); void menu_info(void); -void menu_deah(void); +void menu_death(void); diff --git a/src/player.c b/src/player.c index 5c4be41..1c6a081 100644 --- a/src/player.c +++ b/src/player.c @@ -89,7 +89,11 @@ typedef struct GUI_ { Vec2 target; } GUI; -GUI gui; // Le Gui! +GUI gui = { + .gfx_frame = NULL, + .gfx_targetPilot = NULL, + .gfx_targetPlanet = NULL +}; double gui_xoff = 0.; double gui_yoff = 0.; @@ -912,9 +916,9 @@ static int gui_parse(const xmlNodePtr parent, const char* name) { // Free the GUI. void gui_free(void) { - gl_freeTexture(gui.gfx_frame); - gl_freeTexture(gui.gfx_targetPilot); - gl_freeTexture(gui.gfx_targetPlanet); + if(gui.gfx_frame) gl_freeTexture(gui.gfx_frame); + if(gui.gfx_targetPilot) gl_freeTexture(gui.gfx_targetPilot); + if(gui.gfx_targetPlanet) gl_freeTexture(gui.gfx_targetPlanet); free(msg_stack); }