From cf44ff800083d9fef841e3f64dc377d45a18837b Mon Sep 17 00:00:00 2001 From: Vadim Kuznetsov Date: Mon, 12 Aug 2024 11:25:07 +0300 Subject: [PATCH] Fix wrong Octave path --- qucs/main.cpp | 1 - qucs/settings.cpp | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/qucs/main.cpp b/qucs/main.cpp index 1b1a6c5c0..985d71a05 100644 --- a/qucs/main.cpp +++ b/qucs/main.cpp @@ -131,7 +131,6 @@ bool loadSettings() QucsSettings.SimParameters = _settings::Get().item("SimParameters"); QucsSettings.OctaveExecutable = _settings::Get().item("OctaveExecutable"); - QucsSettings.OctaveExecutable = _settings::Get().item("OctaveBinDir"); QucsSettings.OpenVAFExecutable = _settings::Get().item("OpenVAFExecutable"); QucsSettings.RFLayoutExecutable = _settings::Get().item("RFLayoutExecutable"); diff --git a/qucs/settings.cpp b/qucs/settings.cpp index 0ee682d04..7b06fc107 100644 --- a/qucs/settings.cpp +++ b/qucs/settings.cpp @@ -56,10 +56,12 @@ void settingsManager::initDefaults() m_Defaults["NgspiceExecutable"] = "ngspice_con.exe"; m_Defaults["XyceExecutable"] = "Xyce.exe"; m_Defaults["RFLayoutExecutable"] = "qucsrflayout.exe"; + m_Defaults["OctaveExecutable"] = "octave.exe"; #else m_Defaults["NgspiceExecutable"] = "ngspice"; m_Defaults["XyceExecutable"] = "/usr/local/Xyce-Release-6.8.0-OPENSOURCE/bin/Xyce"; m_Defaults["RFLayoutExecutable"] = "qucsrflayout"; + m_Defaults["OctaveExecutable"] = "octave"; #endif m_Defaults["XyceParExecutable"] = "mpirun -np %p /usr/local/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bin/Xyce";