From 71ec50e2f85ef84f3741330930c01edbb228bc47 Mon Sep 17 00:00:00 2001
From: Vadim Kuznetsov <ra3xdh@gmail.com>
Date: Wed, 13 Mar 2024 13:02:59 +0300
Subject: [PATCH] Fix save netlist from CLI

---
 qucs/extsimkernels/ngspice.cpp | 20 +++++++++++---------
 qucs/main.cpp                  |  3 +++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/qucs/extsimkernels/ngspice.cpp b/qucs/extsimkernels/ngspice.cpp
index 450a9051..a9a63287 100644
--- a/qucs/extsimkernels/ngspice.cpp
+++ b/qucs/extsimkernels/ngspice.cpp
@@ -123,15 +123,17 @@ void Ngspice::createNetlist(QTextStream &stream, int ,
 
     stream << "\n.control\n\n";          //execute simulations
 
-    if (!QucsMain->ProjName.isEmpty()) {
-        // always load osdi from the project directory
-        QStringList osdi_ext;
-        osdi_ext<<"*.osdi";
-        QStringList osdi_files = QucsSettings.QucsWorkDir.entryList(osdi_ext,QDir::Files);
-        for(const auto &file : osdi_files) {
-            QString abs_file = QucsSettings.QucsWorkDir.absolutePath() +
-                               QDir::separator() + file;
-            stream<<QString("pre_osdi '%1'\n").arg(abs_file);
+    if (QucsMain != nullptr) { // if not run from CLI
+        if (!QucsMain->ProjName.isEmpty()) {
+            // always load osdi from the project directory
+            QStringList osdi_ext;
+            osdi_ext<<"*.osdi";
+            QStringList osdi_files = QucsSettings.QucsWorkDir.entryList(osdi_ext,QDir::Files);
+            for(const auto &file : osdi_files) {
+                QString abs_file = QucsSettings.QucsWorkDir.absolutePath() +
+                        QDir::separator() + file;
+                stream<<QString("pre_osdi '%1'\n").arg(abs_file);
+            }
         }
     }
 
diff --git a/qucs/main.cpp b/qucs/main.cpp
index c2ce13d4..0a98ecfd 100644
--- a/qucs/main.cpp
+++ b/qucs/main.cpp
@@ -369,6 +369,7 @@ Schematic *openSchematic(QString schematic)
 int doNetlist(QString schematic, QString netlist)
 {
   QucsSettings.DefaultSimulator = spicecompat::simQucsator;
+  Module::registerModules();
   Schematic *sch = openSchematic(schematic);
   if (sch == NULL) {
     return 1;
@@ -473,6 +474,7 @@ int runXyce(QString schematic, QString dataset)
 int doNgspiceNetlist(QString schematic, QString netlist)
 {
     QucsSettings.DefaultSimulator = spicecompat::simNgspice;
+    Module::registerModules();
     Schematic *sch = openSchematic(schematic);
     if (sch == NULL) {
       return 1;
@@ -488,6 +490,7 @@ int doNgspiceNetlist(QString schematic, QString netlist)
 int doXyceNetlist(QString schematic, QString netlist)
 {
     QucsSettings.DefaultSimulator = spicecompat::simXyce;
+    Module::registerModules();
     Schematic *sch = openSchematic(schematic);
     if (sch == NULL) {
       return 1;