fixed a bunch of multithreaded loading issues and #174

2018-12-20 23:20:00 +11:00
parent 4de524e7fa
commit 9797a3bf4b
16 changed files with 82 additions and 51 deletions
@@ -125,7 +125,7 @@ QDockWidget *get_focused_panel() {
    if (w == NULL) {
        if (panel_project->is_focused()) {
            w = panel_project;
-        } else if (panel_effect_controls->keyframe_focus()) {
+		} else if (panel_effect_controls->keyframe_focus() || panel_effect_controls->is_focused()) {
            w = panel_effect_controls;
        } else if (panel_sequence_viewer->is_focused()) {
            w = panel_sequence_viewer;