[MPlayer-cvslog] r35873 - in trunk/gui/ui: main.c playbar.c video.c

[ib]

Author: ib
Date: Fri Jan 25 12:57:24 2013
New Revision: 35873

Log:
Fix segmentation fault with menu window.

Check whether menu is present before calling menu's mouse handler.

Modified:
   trunk/gui/ui/main.c
   trunk/gui/ui/playbar.c
   trunk/gui/ui/video.c

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Fri Jan 25 12:51:37 2013	(r35872)
+++ trunk/gui/ui/main.c	Fri Jan 25 12:57:24 2013	(r35873)
@@ -189,7 +189,7 @@ rollerhandled:
                  wsWindowMove( &guiApp.mainWindow,True,RX - abs( sx ),RY - abs( sy ) );
                  break;
             case itPRMButton:
-                 guiApp.menuWindow.MouseHandler( 0,RX,RY,0,0 );
+                 if (guiApp.menuIsPresent) guiApp.menuWindow.MouseHandler( 0,RX,RY,0,0 );
                  break;
             case itPotmeter:
                  item->value=(float)( X - item->x ) / item->width * 100.0f;

Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c	Fri Jan 25 12:51:37 2013	(r35872)
+++ trunk/gui/ui/playbar.c	Fri Jan 25 12:57:24 2013	(r35873)
@@ -211,7 +211,7 @@ rollerhandled:
 	switch ( itemtype )
 	 {
 	  case itPRMButton:
-	       guiApp.menuWindow.MouseHandler( 0,RX,RY,0,0 );
+	       if (guiApp.menuIsPresent) guiApp.menuWindow.MouseHandler( 0,RX,RY,0,0 );
 	       break;
 	  case itPotmeter:
 	       item->value=(float)( X - item->x ) / item->width * 100.0f;

Modified: trunk/gui/ui/video.c
==============================================================================
--- trunk/gui/ui/video.c	Fri Jan 25 12:51:37 2013	(r35872)
+++ trunk/gui/ui/video.c	Fri Jan 25 12:57:24 2013	(r35873)
@@ -89,7 +89,7 @@ void uiVideoMouse( int Button,int X,int 
                     }
                    break;
             case wsPMMouseButton:
-                   guiApp.menuWindow.MouseHandler( 0,RX,RY,0,0 );
+                   if (guiApp.menuIsPresent) guiApp.menuWindow.MouseHandler( 0,RX,RY,0,0 );
                    break;
 	    default: uiPlaybarShow( Y ); break;
            }