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

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index 2ee2e2cb..8d8e22c7 100644
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -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;