Mods for 1.4.1a

nmfs-fish-tools · Dec 13, 2022 · c706b16 · c706b16
1 parent eed5ca7
commit c706b16
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/MSSPM_GuiEstimation/nmfEstimationTab01.cpp b/MSSPM_GuiEstimation/nmfEstimationTab01.cpp
@@ -1816,6 +1816,9 @@ nmfEstimation_Tab1::loadWidgets()
 
     bool okSpecies = loadSpecies();
     bool okGuilds  = loadGuilds();
+    if (! okSpecies || ! okGuilds) {
+        return false;
+    }
 
     resetVisibleColumns();
     if (okSpecies) {
@@ -1929,6 +1932,10 @@ nmfEstimation_Tab1::loadSpecies()
     QLocale locale(QLocale::English);
     QString valueWithComma;
 
+    if (NumSpecies == 0) {
+        return false;
+    }
+
     m_originalSpeciesValuesAll.clear();
     m_SpeciesModel = new QStandardItemModel( NumSpecies, fields.size() );
     for (int row=0; row<NumSpecies; ++row) {

diff --git a/MSSPM_Main/nmfMainWindow.cpp b/MSSPM_Main/nmfMainWindow.cpp
@@ -2087,7 +2087,7 @@ void
 nmfMainWindow::menu_about()
 {
     QString name    = "Multi-Species Surplus Production Model";
-    QString version = "MSSPM v1.4.0a ";
+    QString version = "MSSPM v1.4.1a ";
     QString specialAcknowledgement = "";
     QString cppVersion   = "C++??";
     QString mysqlVersion = "?";