Fix CodeQL issues

Signed-off-by: Geoff Hutchison <[email protected]>
ghutchis · Oct 10, 2023 · c4cbdc1 · c4cbdc1 · github-actions · Oct 10, 2023
1 parent 85b69a8
commit c4cbdc1
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/avogadro/qtplugins/aligntool/aligntool.cpp b/avogadro/qtplugins/aligntool/aligntool.cpp
@@ -316,12 +316,12 @@ bool AlignTool::handleCommand(const QString& command,
   if (command == "centerAtom") {
     if (options.contains("id")) {
       Index atomIndex = options["id"].toInt();
-      if (atomIndex >= 0 && atomIndex < m_molecule->atomCount())
+      if (atomIndex < m_molecule->atomCount())
         shiftAtomToOrigin(atomIndex);
       return true;
     } else if (options.contains("index")) {
       Index atomIndex = options["index"].toInt();
-      if (atomIndex >= 0 && atomIndex < m_molecule->atomCount())
+      if (atomIndex < m_molecule->atomCount())
         shiftAtomToOrigin(atomIndex);
       return true;
     }
@@ -344,19 +344,21 @@ bool AlignTool::handleCommand(const QString& command,
     if (axis >= 0 && axis < 3) {
       if (options.contains("id")) {
         Index atomIndex = options["id"].toInt();
-        if (atomIndex >= 0 && atomIndex < m_molecule->atomCount())
+        if (atomIndex < m_molecule->atomCount())
           alignAtomToAxis(atomIndex, axis);
         return true;
       } else if (options.contains("index")) {
         Index atomIndex = options["index"].toInt();
-        if (atomIndex >= 0 && atomIndex < m_molecule->atomCount())
+        if (atomIndex < m_molecule->atomCount())
           alignAtomToAxis(atomIndex, axis);
         return true;
       }
     }
 
-    return true;
+    return false; // invalid options
   }
+
+  return true; // nothing to handle
 }
 
 } // namespace Avogadro::QtPlugins