X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferencesthread.C;h=8d8e22c79bc2aafe8e16d177ad1b113c21ccf660;hb=5a7faba81bcd03755bfe651bacbc5980171fe9de;hp=b27342e0d15805923d85a7a47d4b428122ce243f;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index b27342e0..8d8e22c7 100644
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -66,7 +66,7 @@
 
 
 PreferencesMenuitem::PreferencesMenuitem(MWindow *mwindow)
- : BC_MenuItem(_("Preferences..."), _("Shift+P"), 'P')
+ : BC_MenuItem(_("Preferences..."), _("Shift-P"), 'P')
 {
 	this->mwindow = mwindow;
 
@@ -214,6 +214,8 @@ int PreferencesThread::apply_settings()
 
 	mwindow->reset_android_remote();
 	mwindow->gui->ffmpeg_toggle->update(mwindow->preferences->ffmpeg_early_probe);
+	mwindow->gui->ffmpeg_toggle->set_tooltip( mwindow->preferences->ffmpeg_early_probe ?
+		_("Try FFMpeg first") : _("Try FFMpeg last") );
 	mwindow->gui->mainshbtns->load(mwindow->preferences);
 	double tc_position = 
 		mwindow->edl->session->get_frame_offset() / mwindow->edl->session->frame_rate;
@@ -242,9 +244,9 @@ int PreferencesThread::apply_settings()
 
 
 
-		for(int i = 0; i < mwindow->vwindows.size(); i++)
-		{
+		for(int i = 0; i < mwindow->vwindows.size(); i++) {
 			VWindow *vwindow = mwindow->vwindows.get(i);
+			if( !vwindow->is_running() ) continue;
 			vwindow->gui->lock_window("PreferencesThread::apply_settings");
 			vwindow->gui->meters->change_format(edl->session->meter_format,
 				edl->session->min_meter_db,
@@ -358,15 +360,7 @@ PreferencesWindow::PreferencesWindow(MWindow *mwindow,
 	int x,
 	int y)
  : BC_Window(_(PROGRAM_NAME ": Preferences"),
- 	x,
-	y,
- 	WIDTH,
-	HEIGHT,
-	(int)BC_INFINITY,
-	(int)BC_INFINITY,
-	0,
-	0,
-	1)
+ 	x,y, WIDTH,HEIGHT, WIDTH,HEIGHT, 1,0,1)
 {
 	this->mwindow = mwindow;
 	this->thread = thread;