Mercurial > mplayer.hg

changeset 35803:8e5a3da0a858

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove pointless condition. The menu has an image for sure. Otherwise skin parsing had aborted with error.
author ib
date Sat, 26 Jan 2013 00:53:25 +0000
parents 2849b02700e5
children 25852c740093
files gui/ui/menu.c
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gui/ui/menu.c	Sat Jan 26 00:45:58 2013 +0000
+++ b/gui/ui/menu.c	Sat Jan 26 00:53:25 2013 +0000
@@ -45,7 +45,7 @@
  uint32_t * drw = NULL;
  int             x,y,tmp;
 
- if ( !guiApp.menuIsPresent || !guiApp.menu.Bitmap.Image ) return;
+ if ( !guiApp.menuIsPresent ) return;
  if ( !uiMenuRender && !guiApp.menuWindow.Visible ) return;
 
  if ( uiMenuRender || menuItem != oldMenuItem )
@@ -75,8 +75,6 @@
 {
  int x,y,i;
 
- if ( !guiApp.menu.Bitmap.Image ) return;
-
  menuItem=-1;
  x=X - guiApp.menuWindow.X;
  y=Y - guiApp.menuWindow.Y;
@@ -98,7 +96,7 @@
 void uiMenuInit( void )
 {
 
- if ( !guiApp.menuIsPresent || !guiApp.menu.Bitmap.Image ) return;
+ if ( !guiApp.menuIsPresent ) return;
 
  guiApp.menu.x=0;
  guiApp.menu.y=0;
@@ -134,7 +132,7 @@
 {
  int x,y;
 
- if ( !guiApp.menuIsPresent || !guiApp.menu.Bitmap.Image ) return;
+ if ( !guiApp.menuIsPresent ) return;
 
  x=mx;
  if ( x + guiApp.menuWindow.Width > wsMaxX ) x=wsMaxX - guiApp.menuWindow.Width - 1 + wsOrgX;
@@ -157,7 +155,7 @@
 {
  int x,y,i=menuItem;
 
- if ( !guiApp.menuIsPresent || !guiApp.menu.Bitmap.Image ) return;
+ if ( !guiApp.menuIsPresent ) return;
 
  x=mx-menuX;
  y=my-menuY;