X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcpopupmenu.C;h=4d3144b59996a545cb9c3f80fd5d046cd8e496a5;hb=418e8644335db47143bc421f11be2c2e68901d45;hp=6a8c63e2f9daaafa61089100eaf36798d685e89c;hpb=4f7f413cbc1c6ea5da27cb75ca27a3ab317243ec;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/bcpopupmenu.C b/cinelerra-5.1/guicast/bcpopupmenu.C index 6a8c63e2..4d3144b5 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 #include "vframe.h" @@ -96,6 +96,7 @@ BC_PopupMenu::~BC_PopupMenu() { use_title = 0; deactivate(); + delete menu_popup; for(int i = 0; i < TOTAL_IMAGES; i++) { if(images[i]) delete images[i]; @@ -290,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; } @@ -327,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()