From ed5891b8e85f354e7e989b0504cf08490dc8850b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 29 Mar 2015 19:25:48 +0200
Subject: [PATCH] Rename gl_coord_array_release to gl_coord_array_free

---
 gfx/gl_common.c     | 2 +-
 gfx/gl_common.h     | 3 +--
 menu/drivers/glui.c | 5 ++++-
 menu/drivers/xmb.c  | 6 +++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/gfx/gl_common.c b/gfx/gl_common.c
index 76d12b9cc3..06b9c3ecf3 100644
--- a/gfx/gl_common.c
+++ b/gfx/gl_common.c
@@ -184,7 +184,7 @@ bool gl_coord_array_add(gl_coord_array_t *ca, const gl_coords_t *coords, unsigne
    return success;
 }
 
-void gl_coord_array_release(gl_coord_array_t *ca)
+void gl_coord_array_free(gl_coord_array_t *ca)
 {
    if (!ca->allocated)
       return;
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index e2ee629193..befa2ddc38 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -21,7 +21,6 @@
 #include "font_renderer_driver.h"
 #include <gfx/math/matrix_4x4.h>
 #include <gfx/scaler/scaler.h>
-//#include "font_gl_driver.h"
 #include <formats/image.h>
 #include "video_shader_driver.h"
 #include <retro_inline.h>
@@ -440,6 +439,6 @@ static INLINE unsigned gl_wrap_type_to_enum(enum gfx_wrap_type type)
 }
 
 bool gl_coord_array_add(gl_coord_array_t *ca, const gl_coords_t *coords, unsigned count);
-void gl_coord_array_release(gl_coord_array_t *ca);
+void gl_coord_array_free(gl_coord_array_t *ca);
 
 #endif
diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index 4115cc55e1..54590477d1 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -543,7 +543,10 @@ static void glui_free(void *data)
    menu_handle_t *menu = (menu_handle_t*)data;
    glui_handle_t *glui = (glui_handle_t*)menu->userdata;
 
-   gl_coord_array_release(&glui->raster_block.carr);
+   if (!glui)
+      return;
+
+   gl_coord_array_free(&glui->raster_block.carr);
 
    font_driver = (const struct gl_font_renderer*)gl->font_driver;
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 777a24293c..519c6ea078 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1527,7 +1527,11 @@ static void xmb_free(void *data)
    if (menu && menu->userdata)
    {
       xmb = (xmb_handle_t*)menu->userdata;
-      gl_coord_array_release(&xmb->raster_block.carr);
+
+      if (!xmb)
+         return;
+
+      gl_coord_array_free(&xmb->raster_block.carr);
 
       free(menu->userdata);
       menu->userdata = NULL;