Mercurial > mplayer.hg

changeset 35795:5eac7c0879b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make mainDrawBuffer static. Additionally, remove unnecessary initialization.
author ib
date Fri, 25 Jan 2013 22:31:37 +0000
parents 153a4c76e291
children 497a1c45a597
files gui/ui/actions.c gui/ui/main.c gui/ui/ui.h
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gui/ui/actions.c	Fri Jan 25 21:52:55 2013 +0000
+++ b/gui/ui/actions.c	Fri Jan 25 22:31:37 2013 +0000
@@ -645,7 +645,6 @@
 
     /* reload main window */
 
-    free(mainDrawBuffer);
     wsWindowDestroy(&guiApp.mainWindow);
 
     uiMainInit();
--- a/gui/ui/main.c	Fri Jan 25 21:52:55 2013 +0000
+++ b/gui/ui/main.c	Fri Jan 25 22:31:37 2013 +0000
@@ -54,7 +54,7 @@
 
 #include "actions.h"
 
-unsigned char * mainDrawBuffer = NULL;
+static unsigned char * mainDrawBuffer;
 int             uiMainRender = True;
 
 int             mainVisible = True;
@@ -340,6 +340,8 @@
 
 void uiMainInit (void)
 {
+  if (mainDrawBuffer) free(mainDrawBuffer);
+
   mainDrawBuffer = malloc(guiApp.main.Bitmap.ImageSize);
 
   if (!mainDrawBuffer)
--- a/gui/ui/ui.h	Fri Jan 25 21:52:55 2013 +0000
+++ b/gui/ui/ui.h	Fri Jan 25 22:31:37 2013 +0000
@@ -19,7 +19,6 @@
 #ifndef MPLAYER_GUI_UI_H
 #define MPLAYER_GUI_UI_H
 
-extern unsigned char * mainDrawBuffer;
 extern unsigned char * menuDrawBuffer;
 extern int             mainVisible;