From 6a43ca8410ba995fd9fbe5baff495bff9f53e314 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Tue, 3 Oct 2023 16:13:59 -0400
Subject: [PATCH] reset number of threads to 1 when using no accelerator or opt

---
 tools/lammps-gui/lammpsgui.cpp   |  2 ++
 tools/lammps-gui/preferences.cpp | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tools/lammps-gui/lammpsgui.cpp b/tools/lammps-gui/lammpsgui.cpp
index cdfb9ab850..73ff530b5c 100644
--- a/tools/lammps-gui/lammpsgui.cpp
+++ b/tools/lammps-gui/lammpsgui.cpp
@@ -508,6 +508,8 @@ void LammpsGui::update_variables()
 
     for (const auto &line : doc) {
 
+        if (line.isEmpty()) continue;
+
         // first find variable definitions.
         // index variables are special since they can be overridden from the command line
         auto index = indexvar.match(line);
diff --git a/tools/lammps-gui/preferences.cpp b/tools/lammps-gui/preferences.cpp
index 624f59009c..aa192e8c11 100644
--- a/tools/lammps-gui/preferences.cpp
+++ b/tools/lammps-gui/preferences.cpp
@@ -40,8 +40,8 @@
 #include <QSpacerItem>
 #include <QSpinBox>
 #include <QTabWidget>
-#include <QVBoxLayout>
 #include <QThread>
+#include <QVBoxLayout>
 
 #if defined(_OPENMP)
 #include <omp.h>
@@ -110,10 +110,15 @@ void Preferences::accept()
         }
     }
 
-    // store number of threads
+    // store number of threads, reset to 1 for "None" and "Opt" settings
     QLineEdit *field = tabWidget->findChild<QLineEdit *>("nthreads");
-    if (field)
-        if (field->hasAcceptableInput()) settings->setValue("nthreads", field->text());
+    if (field) {
+        int accel = settings->value("accelerator", AcceleratorTab::None).toInt();
+        if ((accel == AcceleratorTab::None) || (accel == AcceleratorTab::Opt))
+            settings->setValue("nthreads", 1);
+        else if (field->hasAcceptableInput())
+            settings->setValue("nthreads", field->text());
+    }
 
     // store image width, height, zoom, and rendering settings