rework intl strategy, titler upgrades, fonts fixes, igor ru.po

[goodguy/history.git] / cinelerra-5.1 / cinelerra / preferencesthread.C

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index a7a8287327148f1a363205896b9e904892193184..dd8e9c5182ee8dfdf3f004cf3102c1921f3e065d 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -208,7 +208,7 @@ int PreferencesThread::apply_settings()
                (preferences->force_uniprocessor != mwindow->preferences->force_uniprocessor) ||
                this_playback_config->active_config != playback_config->active_config ||
                (*this_aconfig != *aconfig) || (*this_vconfig != *vconfig) ||
-               !preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1);
+               !preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1, edl);
 
        if( strcmp(preferences->theme, mwindow->preferences->theme) != 0 )
                mwindow->restart_status = -1; // reload, need new bcresources
@@ -220,6 +220,7 @@ int PreferencesThread::apply_settings()
        BC_Signals::set_catch_segv(mwindow->preferences->trap_sigsegv);
        BC_Signals::set_catch_intr(mwindow->preferences->trap_sigintr);
        BC_WindowBase::get_resources()->popupmenu_btnup = mwindow->preferences->popupmenu_btnup;
+       BC_WindowBase::get_resources()->textbox_focus_policy = mwindow->preferences->textbox_focus_policy;
        if( mwindow->preferences->trap_sigsegv || mwindow->preferences->trap_sigintr ) {
                BC_Trace::enable_locks();
        }
@@ -232,7 +233,7 @@ int PreferencesThread::apply_settings()
        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 = 
+       double tc_position =
                mwindow->edl->session->get_frame_offset() / mwindow->edl->session->frame_rate;
        mwindow->gui->mainclock->set_position_offset(tc_position);