# HG changeset patch # User ib # Date 1359115044 0 # Node ID 8ad72f9cf69700d70d7417a991008f2ccb1ea2de # Parent 8ba56e7c14fbe340320eb1ff090c804b57c815a9 Fix segmentation fault with menu window. Check whether menu is present before calling menu's mouse handler. diff -r 8ba56e7c14fb -r 8ad72f9cf697 gui/ui/main.c --- a/gui/ui/main.c Fri Jan 25 11:51:37 2013 +0000 +++ b/gui/ui/main.c Fri Jan 25 11:57:24 2013 +0000 @@ -189,7 +189,7 @@ 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; diff -r 8ba56e7c14fb -r 8ad72f9cf697 gui/ui/playbar.c --- a/gui/ui/playbar.c Fri Jan 25 11:51:37 2013 +0000 +++ b/gui/ui/playbar.c Fri Jan 25 11:57:24 2013 +0000 @@ -211,7 +211,7 @@ 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; diff -r 8ba56e7c14fb -r 8ad72f9cf697 gui/ui/video.c --- a/gui/ui/video.c Fri Jan 25 11:51:37 2013 +0000 +++ b/gui/ui/video.c Fri Jan 25 11:57:24 2013 +0000 @@ -89,7 +89,7 @@ } 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; }