X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmenueffects.C;h=92217a6b93dd9e9409a987b2846739c9ce333f34;hb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da;hp=34881cf44f647d2d3df3e45ca3ea0c36f74092fc;hpb=723142d62d61cde588e961426440f839ca9dcda9;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/menueffects.C b/cinelerra-5.1/cinelerra/menueffects.C
index 34881cf4..92217a6b 100644
--- a/cinelerra-5.1/cinelerra/menueffects.C
+++ b/cinelerra-5.1/cinelerra/menueffects.C
@@ -169,7 +169,7 @@ void MenuEffectThread::run()
 	get_derived_attributes(default_asset, defaults);
 //	to_tracks = defaults->get("RENDER_EFFECT_TO_TRACKS", 1);
 	load_mode = defaults->get("RENDER_EFFECT_LOADMODE", LOADMODE_PASTE);
-	file_per_label = defaults->get("RENDER_FILE_PER_LABEL", 0);
+	use_labels = defaults->get("RENDER_FILE_PER_LABEL", 0);
 
 // get plugin information
 	int need_plugin = !strlen(title) ? 1 : 0;
@@ -207,7 +207,7 @@ void MenuEffectThread::run()
 // save defaults
 	save_derived_attributes(default_asset, defaults);
 	defaults->update("RENDER_EFFECT_LOADMODE", load_mode);
-	defaults->update("RENDER_EFFECT_FILE_PER_LABEL", file_per_label);
+	defaults->update("RENDER_EFFECT_FILE_PER_LABEL", use_labels);
 	mwindow->save_defaults();
 
 // get plugin server to use and delete the plugin list
@@ -360,7 +360,7 @@ void MenuEffectThread::run()
 		default_asset->height = mwindow->edl->session->output_h;
 	}
 
-	int strategy = Render::get_strategy(mwindow->preferences->use_renderfarm, file_per_label);
+	int strategy = Render::get_strategy(mwindow->preferences->use_renderfarm, use_labels);
 // Process the total length in fragments
 	ArrayList<MenuEffectPacket*> packets;
 	if(!result)
@@ -618,7 +618,7 @@ void MenuEffectWindow::create_objects()
 	add_subwindow(file_title = new BC_Title(
 		mwindow->theme->menueffect_file_x,
 		mwindow->theme->menueffect_file_y,
-		(char*)(menueffects->file_per_label ?
+		(char*)(menueffects->use_labels ?
 			_("Select the first file to render to:") :
 			_("Select a file to render to:"))));
 
@@ -628,7 +628,7 @@ void MenuEffectWindow::create_objects()
 					this,
 					asset);
 	format_tools->create_objects(x, y, asset->audio_data, asset->video_data,
-		0, 0, 0, 1, 0, 0, &menueffects->file_per_label, 0);
+		0, 0, 0, 1, 0, 0, &menueffects->use_labels, 0);
 
 	loadmode = new LoadMode(mwindow, this, x, y, &menueffects->load_mode, 1);
 	loadmode->create_objects();
@@ -746,9 +746,7 @@ MenuEffectPrompt::MenuEffectPrompt(MWindow *mwindow)
 		MenuEffectPrompt::calculate_h(mwindow->gui),
 		MenuEffectPrompt::calculate_w(mwindow->gui),
 		MenuEffectPrompt::calculate_h(mwindow->gui),
-		0,
-		0,
-		1)
+		0, 0, 1)
 {
 }
 
@@ -769,6 +767,7 @@ int MenuEffectPrompt::calculate_h(BC_WindowBase *gui)
 
 void MenuEffectPrompt::create_objects()
 {
+	lock_window("MenuEffectPrompt::create_objects");
 	int x = 10, y = 10;
 	BC_Title *title;
 	add_subwindow(title = new BC_Title(x, y, PROMPT_TEXT));
@@ -776,5 +775,6 @@ void MenuEffectPrompt::create_objects()
 	add_subwindow(new BC_CancelButton(this));
 	show_window();
 	raise_window();
+	unlock_window();
 }