projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add proxy index builds, perperual session, backup.prev, disarmed track indication...
[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 b25075b8657fb1ce91113c74e9dcadd88abe76a6..bf921724d531bee53da724ae209c508aa9aae89b 100644
(file)
--- a/
cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/
cinelerra-5.1/cinelerra/preferencesthread.C
@@
-225,6
+225,10
@@
int PreferencesThread::apply_settings()
mwindow->gui->unlock_window();
redraw_overlays = 1;
}
mwindow->gui->unlock_window();
redraw_overlays = 1;
}
+ PreferencesWindow *window = (PreferencesWindow*)get_gui();
+ if( window ) window->unlock_window();
+ mwindow->init_brender();
+ if( window ) window->lock_window("PreferencesThread::apply_settings 5");
if( strcmp(preferences->theme, mwindow->preferences->theme) != 0 )
mwindow->restart_status = -1; // reload, need new bcresources
if( strcmp(preferences->theme, mwindow->preferences->theme) != 0 )
mwindow->restart_status = -1; // reload, need new bcresources
@@
-233,7
+237,6
@@
int PreferencesThread::apply_settings()
mwindow->edl->copy_session(edl, 1);
mwindow->preferences->copy_from(preferences);
mwindow->edl->copy_session(edl, 1);
mwindow->preferences->copy_from(preferences);
- mwindow->init_brender();
BC_Signals::set_catch_segv(mwindow->preferences->trap_sigsegv);
BC_Signals::set_catch_intr(mwindow->preferences->trap_sigintr);
BC_Signals::set_catch_segv(mwindow->preferences->trap_sigsegv);
BC_Signals::set_catch_intr(mwindow->preferences->trap_sigintr);