Various headless mode fixes

open-ephys · Oct 6, 2023 · ee0f991 · ee0f991
1 parent 677b27e
commit ee0f991
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/Source/Processors/FileReader/FileReader.cpp b/Source/Processors/FileReader/FileReader.cpp
@@ -789,7 +789,11 @@ ScrubberInterface* FileReader::getScrubberInterface()
 void FileReader::saveCustomParametersToXml (XmlElement* xml)
 {
     XmlElement* childNode = xml->createNewChildElement ("SCRUBBERINTERFACE");
-    childNode->setAttribute ("show", getScrubberInterface()->isVisible() ? "true" : "false");
+
+    if(headlessMode)
+        childNode->setAttribute ("show", "false");
+    else
+        childNode->setAttribute ("show", getScrubberInterface()->isVisible() ? "true" : "false");
 }
 
 void FileReader::loadCustomParametersFromXml (XmlElement* xml)

diff --git a/Source/Processors/Merger/Merger.cpp b/Source/Processors/Merger/Merger.cpp
@@ -57,8 +57,12 @@ void Merger::setMergerSourceNode(GenericProcessor* sn)
     {
         sourceNodeA = sn;
         activePath = 0;
-        MergerEditor* ed = (MergerEditor*)getEditor();
-        ed->switchSource(activePath, false);
+
+        if(!headlessMode)
+        {
+            MergerEditor* ed = (MergerEditor*)getEditor();
+            ed->switchSource(activePath, false);
+        }
     }
     else
     {

diff --git a/Source/Processors/ProcessorGraph/ProcessorGraph.cpp b/Source/Processors/ProcessorGraph/ProcessorGraph.cpp
@@ -567,7 +567,7 @@ void ProcessorGraph::updateViews(GenericProcessor* processor, bool updateGraphVi
     {
         LOGD("Processor to view: ", processor->getName());
 
-        if (processor->isSplitter())
+        if (processor->isSplitter() && !isConsoleApp)
         {
             SplitterEditor* spEditor = (SplitterEditor*)processor->getEditor();
             Splitter*  spProc = (Splitter*)processor;
@@ -1406,10 +1406,10 @@ void ProcessorGraph::removeProcessor(GenericProcessor* processor)
 
     checkForNewRootNodes(processor, false, false);
 
-    AccessClass::getGraphViewer()->removeNode(processor);
-
-    if (AccessClass::getEditorViewport() != nullptr) //headless mode
+    if (!isConsoleApp)
     {
+        AccessClass::getGraphViewer()->removeNode(processor);
+
         AccessClass::getEditorViewport()->removeEditor(processor->editor.get());
 
         //// need this to prevent editors from remaining after starting acquisition