merged with master

2019-03-21 17:22:36 +11:00
parent 262e93460f 1da4a315f8
commit dd06230c04
46 changed files with 943 additions and 320 deletions
@@ -136,7 +136,7 @@ int main(int argc, char *argv[]) {
  olive::rendering::InitializeBitDepths();

  // connect main window's first paint to global's init finished function
-  QObject::connect(&w, SIGNAL(finished_first_paint()), olive::Global.get(), SLOT(finished_initialize()));
+  QObject::connect(&w, SIGNAL(finished_first_paint()), olive::Global.get(), SLOT(finished_initialize()), Qt::QueuedConnection);

  if (!load_proj.isEmpty()) {
    olive::Global->load_project_on_launch(load_proj);