X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferencesthread.C;h=3ca281e54e6fe08cc1cfa7cf2c104f03b2871998;hb=c57aa3e2800e06f890e644dc54c9e0bba6d0851a;hp=47f16efd8345f2594f11e081d66b6ed08ccc9ce6;hpb=45a8ba3455cf252332c03533a7590df5267ce9aa;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index 47f16efd..3ca281e5 100644
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -278,9 +278,11 @@ int PreferencesThread::apply_settings()
 
 	mwindow->reset_android_remote();
 	int ffmpeg_early_probe = mwindow->preferences->get_file_probe_armed("FFMPEG_Early");
+	mwindow->gui->lock_window("PreferencesThread::apply_settings 6");
 	mwindow->gui->ffmpeg_toggle->update(ffmpeg_early_probe);
 	mwindow->gui->ffmpeg_toggle->set_tooltip(ffmpeg_early_probe ?
 		FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP);
+	mwindow->gui->unlock_window();
 	mwindow->gui->mainshbtns->load(mwindow->preferences);
 	mwindow->init_brender();
 
@@ -438,6 +440,8 @@ PreferencesWindow::PreferencesWindow(MWindow *mwindow,
 	category = 0;
 	dialog = 0;
 	confirm_dialog = 0;
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Settings and Preferences");
 }
 
 PreferencesWindow::~PreferencesWindow()
@@ -689,7 +693,7 @@ int PreferencesOK::keypress_event()
 {
 	if( get_keypress() == RETURN )
 		return handle_event();
-	return 0;
+	return context_help_check_and_show();
 }
 
 int PreferencesOK::handle_event()
@@ -763,7 +767,7 @@ int PreferencesCancel::keypress_event()
 		thread->window->set_done(1);
 		return 1;
 	}
-	return 0;
+	return context_help_check_and_show();
 }
 int PreferencesCancel::handle_event()
 {