Replaced if condition by VERIFY_OR_DEBUG_ASSERT

Fixed the condition for the maximum allowed value

2 files changed, 8 insertions, 3 deletions

diff --git a/src/library/browse/browsetablemodel.cpp b/src/library/browse/browsetablemodel.cpp
index 23ccd5ad0c..85d91a7754 100644
--- a/src/library/browse/browsetablemodel.cpp
+++ b/src/library/browse/browsetablemodel.cpp
@@ -136,7 +136,7 @@ BrowseTableModel::~BrowseTableModel() {
 
 int BrowseTableModel::columnIndexFromSortColumnId(TrackModel::SortColumnId column) {
     if (column < TrackModel::SortColumnId::SORTCOLUMN_ID_MIN ||
-            column > TrackModel::SortColumnId::SORTCOLUMN_ID_MAX) {
+            column >= TrackModel::SortColumnId::SORTCOLUMN_ID_MAX) {
         return -1;
     }
 
diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index 9794c7e300..a79dac7010 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -945,8 +945,13 @@ void WTrackTableView::applySortingIfVisible() {
 void WTrackTableView::applySorting() {
     TrackModel* trackModel = getTrackModel();
     int sortColumnId = static_cast<int>(m_pSortColumn->get());
-    if (sortColumnId < TrackModel::SortColumnId::SORTCOLUMN_ID_MIN ||
-            sortColumnId > TrackModel::SortColumnId::SORTCOLUMN_ID_MAX) {
+    if (sortColumnId == TrackModel::SortColumnId::SORTCOLUMN_INVALID) {
+        // During startup phase of Mixxx, this method is called with SORTCOLUMN_INVALID
+        return;
+    }
+    VERIFY_OR_DEBUG_ASSERT(
+            sortColumnId >= TrackModel::SortColumnId::SORTCOLUMN_ID_MIN &&
+            sortColumnId < TrackModel::SortColumnId::SORTCOLUMN_ID_MAX) {
         return;
     }