X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcpopupmenu.C;fp=cinelerra-5.1%2Fguicast%2Fbcpopupmenu.C;h=4c424ae563a2b9aa6666435fd2e5e73f592b2fb5;hb=974869b43e0d7ad356f6fee8549c1e4f14213330;hp=71a172e43b62acbc9bf5edfe63a3c9565740b57c;hpb=25bafacda1fe9d8a9520cad451547a75d934c1bb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bcpopupmenu.C b/cinelerra-5.1/guicast/bcpopupmenu.C
index 71a172e4..4c424ae5 100644
--- a/cinelerra-5.1/guicast/bcpopupmenu.C
+++ b/cinelerra-5.1/guicast/bcpopupmenu.C
@@ -94,7 +94,8 @@ BC_PopupMenu::BC_PopupMenu(int x,
 
 BC_PopupMenu::~BC_PopupMenu()
 {
-	if(menu_popup) delete menu_popup;
+	use_title = 0;
+	deactivate();
 	for(int i = 0; i < TOTAL_IMAGES; i++)
 	{
 		if(images[i]) delete images[i];
@@ -503,25 +504,19 @@ int BC_PopupMenu::cursor_motion_event()
 	int result = 0;
 
 // This menu is down.
-	if(popup_down)
-	{
+	if(popup_down) {
 		result = menu_popup->dispatch_motion_event();
 	}
 
-	if(!result && use_title && top_level->event_win == win)
-	{
-		if(highlighted)
-		{
-			if(!cursor_inside())
-			{
+	if(!result && use_title && is_event_win()) {
+		if(highlighted) {
+			if(!cursor_inside()) {
 				highlighted = 0;
 				draw_title(1);
 			}
 		}
-		else
-		{
-			if(cursor_inside())
-			{
+		else {
+			if(cursor_inside()) {
 				highlighted = 1;
 				draw_title(1);
 				result = 1;