X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcpopupmenu.C;h=be17a0a311403824ec130180a18e2cf7f7b767bd;hb=1c43268ae0d6d6fad8beff33946e1115a8ec34b2;hp=9d8e2c223132310ebc93c8a306a0a3eff8296952;hpb=4b91e8a72deb0be3437ef0edd745646e525534d4;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bcpopupmenu.C b/cinelerra-5.1/guicast/bcpopupmenu.C
index 9d8e2c22..be17a0a3 100644
--- a/cinelerra-5.1/guicast/bcpopupmenu.C
+++ b/cinelerra-5.1/guicast/bcpopupmenu.C
@@ -26,7 +26,7 @@
 #include "bcpopupmenu.h"
 #include "bcresources.h"
 #include "bcsignals.h"
-#include "colors.h"
+#include "bccolors.h"
 #include "fonts.h"
 #include <string.h>
 #include "vframe.h"
@@ -291,6 +291,7 @@ int BC_PopupMenu::activate_menu()
 {
 	if( !get_button_down() || !BC_WindowBase::get_resources()->popupmenu_btnup )
 		return menu_activate();
+	top_level->active_popup_menu = this;
 	pending = 1;
 	return 0;
 }
@@ -328,7 +329,7 @@ int BC_PopupMenu::menu_activate()
 		popup_down = 1;
 		if(use_title) draw_title(1);
 	}
-	return 0;
+	return 1;
 }
 
 int BC_PopupMenu::deactivate_menu()
@@ -472,7 +473,7 @@ int BC_PopupMenu::cursor_leave_event()
 	if( popup_down ) {
 		if( !get_button_down() && !menu_popup->cursor_inside() ) {
 			status = BUTTON_UP;
-			deactivate_menu();
+//			deactivate_menu();
 		}
 		menu_popup->dispatch_cursor_leave();
 	}