Merge pull request #1793 from ghutchis/fix-vdw-crash

Fix a potential crash in the new translucent VdW & licorice code
OpenChemistry · Nov 18, 2024 · abcb778 · abcb778
2 parents 27d5bb7 + bf1229a
commit abcb778
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/avogadro/qtplugins/licorice/licorice.cpp b/avogadro/qtplugins/licorice/licorice.cpp
@@ -124,7 +124,9 @@ void Licorice::process(const Molecule& molecule, Rendering::GroupNode& node)
     }
     Vector3ub color = atom.color();
 
-    opacity = m_layerManager.getSetting<LayerLicorice>(i)->opacity;
+    auto* interface =
+      m_layerManager.getSetting<LayerLicorice>(m_layerManager.getLayerID(i));
+    opacity = interface->opacity;
     if (opacity < 1.0f) {
       translucentSpheres->addSphere(atom.position3d().cast<float>(), color,
                                     radius, i);

diff --git a/avogadro/qtplugins/vanderwaals/vanderwaals.cpp b/avogadro/qtplugins/vanderwaals/vanderwaals.cpp
@@ -121,7 +121,9 @@ void VanDerWaals::process(const QtGui::Molecule& molecule,
 
     Vector3ub color = atom.color();
     auto radius = static_cast<float>(Elements::radiusVDW(atomicNumber));
-    float opacity = m_layerManager.getSetting<LayerVdW>(i)->opacity;
+    auto* interface =
+      m_layerManager.getSetting<LayerVdW>(m_layerManager.getLayerID(i));
+    float opacity = interface->opacity;
     if (opacity < 1.0f) {
       translucentSpheres->addSphere(atom.position3d().cast<float>(), color,
                                     radius, i);