X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcpopupmenu.C;h=2fb69d1cb2ecd8010a8b634a07691e8f6d0409d5;hp=4c639fe27d25890f96bd4289cc77c21c651ca569;hb=ab958f323d68316c450ef81ba296536580620163;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/guicast/bcpopupmenu.C b/cinelerra-5.1/guicast/bcpopupmenu.C
index 4c639fe2..2fb69d1c 100644
--- a/cinelerra-5.1/guicast/bcpopupmenu.C
+++ b/cinelerra-5.1/guicast/bcpopupmenu.C
@@ -53,11 +53,8 @@ BC_PopupMenu::BC_PopupMenu(int x,
 	highlighted = popup_down = 0;
 	menu_popup = 0;
 	icon = 0;
-	if(margin >= 0)
-		this->margin = margin;
-	else
-		this->margin = BC_WindowBase::get_resources()->popupmenu_margin;
-
+	this->margin = margin >= 0 ? margin :
+		BC_WindowBase::get_resources()->popupmenu_margin;
 	this->use_title = use_title;
 	strcpy(this->text, text);
 	for(int i = 0; i < TOTAL_IMAGES; i++)
@@ -80,6 +77,7 @@ BC_PopupMenu::BC_PopupMenu(int x,
 	highlighted = popup_down = 0;
 	menu_popup = 0;
 	icon = 0;
+	this->margin = BC_WindowBase::get_resources()->popupmenu_margin;
 	this->use_title = use_title;
 	strcpy(this->text, text);
 	for(int i = 0; i < TOTAL_IMAGES; i++)