2 files changed, 7 insertions, 2 deletions
diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp
index 09f667cd03..8bae9c3061 100644
--- a/src/engine/controls/cuecontrol.cpp
+++ b/src/engine/controls/cuecontrol.cpp
@@ -44,12 +44,17 @@ inline mixxx::RgbColor::optional_t doubleToRgbColor(double value) {
     return mixxx::RgbColor::optional(colorCode);
 }
 
+/// Convert 0-based hot cue index to 1-based number
 inline int hotcueIndexToHotcueNumber(int hotcueIndex) {
+    DEBUG_ASSERT(hotcueIndex == Cue::kNoHotCue || hotcueIndex >= 0);
     return hotcueIndex + 1;
 }
 
+/// Convert 1-based hot cue number to 0-based index
 inline int hotcueNumberToHotcueIndex(int hotcueNumber) {
-    return hotcueNumber - 1;
+    int hotcueIndex = hotcueNumber - 1;
+    DEBUG_ASSERT(hotcueIndex == Cue::kNoHotCue || hotcueIndex >= 0);
+    return hotcueIndex;
 }
 
 } // namespace
diff --git a/src/engine/controls/cuecontrol.h b/src/engine/controls/cuecontrol.h
index 3634a0d32a..177c1584ea 100644
--- a/src/engine/controls/cuecontrol.h
+++ b/src/engine/controls/cuecontrol.h
@@ -50,7 +50,7 @@ class HotcueControl : public QObject {
         return m_hotcueIndex;
     }
 
-    CuePointer getCue() {
+    CuePointer getCue() const {
         return m_pCue;
     }
     double getPosition() const;