Merge branch 'master' of github.com:sandialabs/InterSpec

sandialabs · Mar 15, 2024 · 99b9b40 · 99b9b40
2 parents 1e894a7 + 367548c
commit 99b9b40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/BatchActivity.cpp b/src/BatchActivity.cpp
@@ -203,7 +203,7 @@ shared_ptr<DetectorPeakResponse> init_drf_from_name( std::string drf_file, std::
       auto drf = DrfSelect::initARelEffDetector( SpecUtils::DetectorType::Unknown,
                                                 manufacturer, model );
       if( drf )
-        return;
+        return drf;
     }catch( std::exception &e )
     {
 

diff --git a/src/SpectrumViewerTester.cpp b/src/SpectrumViewerTester.cpp
@@ -254,6 +254,7 @@ void SpectrumViewerTester::writeStateStaticHtmlHeader( std::ostream &strm,
                                                     const UserState *dbstate )
 {
   const string username = dbstate->user ? dbstate->user->userName() : string("Unknown");
+  const int state_id = dbstate->user ? static_cast<int>(dbstate->user.id()) : -1;
   const string now = WDateTime::currentDateTime().toString( DATE_TIME_FORMAT_STR ).toUTF8();
 
   writeHtmlHeader( strm, dbstate->name.toUTF8() );
@@ -271,7 +272,7 @@ void SpectrumViewerTester::writeStateStaticHtmlHeader( std::ostream &strm,
        << "\t\t\t<tr><th>Description</th><td>"
           << dbstate->description.toUTF8() << "</td></tr>\n"
        << "\t\t\t<tr><th>User State ID</th><td>"
-          << viewer->m_currentStateID << "</td></tr>\n"
+          << state_id << "</td></tr>\n"
        << "\t\t\t<tr><th>Foreground ID</th><td>"
           << dbstate->foregroundId << "</td></tr>\n"
        << "\t\t\t<tr><th>Background ID</th><td>"