From 75c6e62c3e47bdf2b3145a930520b3ca7c009dcb Mon Sep 17 00:00:00 2001 From: Dan White Date: Tue, 6 Sep 2022 12:33:54 -0600 Subject: [PATCH 1/2] Fix headless crash More complex networks will not work in headless mode, I think --- src/Dataflow/Engine/Controller/NetworkEditorController.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Dataflow/Engine/Controller/NetworkEditorController.cc b/src/Dataflow/Engine/Controller/NetworkEditorController.cc index 9506536473..e146cc4072 100644 --- a/src/Dataflow/Engine/Controller/NetworkEditorController.cc +++ b/src/Dataflow/Engine/Controller/NetworkEditorController.cc @@ -71,7 +71,11 @@ NetworkEditorController::NetworkEditorController(ModuleFactoryHandle mf, ModuleS collabs_.algoFactory_ = af; collabs_.reexFactory_ = reex; collabs_.executorFactory_ = executorFactory; + #ifndef BUILD_HEADLESS collabs_.executionManager_.reset(new ExecutionQueueManager); + #else + collabs_.executionManager_.reset(new SimpleExecutionManager); + #endif collabs_.cmdFactory_ = cmdFactory; collabs_.eventCmdFactory_ = eventCmdFactory ? eventCmdFactory : makeShared(); collabs_.serializationManager_ = nesm; From 6ea8efd6bb507d5926fc2e3342c990590f7631c5 Mon Sep 17 00:00:00 2001 From: Dan White Date: Wed, 7 Sep 2022 13:08:50 -0600 Subject: [PATCH 2/2] Update ViewSceneControlsDock.cc --- src/Interface/Modules/Render/ViewSceneControlsDock.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Interface/Modules/Render/ViewSceneControlsDock.cc b/src/Interface/Modules/Render/ViewSceneControlsDock.cc index 1a9a8d9229..bd47edd226 100644 --- a/src/Interface/Modules/Render/ViewSceneControlsDock.cc +++ b/src/Interface/Modules/Render/ViewSceneControlsDock.cc @@ -798,6 +798,8 @@ CompositeLightControls::CompositeLightControls(ViewSceneDialog* parent, const st auto layout = new QHBoxLayout; setLayout(layout); layout->addWidget(tabs_); + if (!lights_.empty()) + setMinimumSize(lights_[0]->minimumSize()); } QColor LightButtonUpdater::color() const