From da14de92fe6f7332206f1b0995f816b8fd54d9cf Mon Sep 17 00:00:00 2001 From: saker Date: Wed, 23 Aug 2023 16:52:35 -0400 Subject: [PATCH] Fix regressions in #6477 (#6826) * Fix if statement in ClipView * Move controllers.begin() to be the first argument It was the second argument, which means it could've returned negatives for random access iterators. --- src/gui/clips/ClipView.cpp | 2 +- src/gui/modals/ControllerConnectionDialog.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/clips/ClipView.cpp b/src/gui/clips/ClipView.cpp index 871466a55..8a190e2a7 100644 --- a/src/gui/clips/ClipView.cpp +++ b/src/gui/clips/ClipView.cpp @@ -559,7 +559,7 @@ DataFile ClipView::createClipDataFiles( // Add extra metadata needed for calculations later const auto initialTrackIt = std::find(tc->tracks().begin(), tc->tracks().end(), t); - if (initialTrackIt != tc->tracks().end()) + if (initialTrackIt == tc->tracks().end()) { printf("Failed to find selected track in the TrackContainer.\n"); return dataFile; diff --git a/src/gui/modals/ControllerConnectionDialog.cpp b/src/gui/modals/ControllerConnectionDialog.cpp index 55c0b476f..040ed9e0f 100644 --- a/src/gui/modals/ControllerConnectionDialog.cpp +++ b/src/gui/modals/ControllerConnectionDialog.cpp @@ -263,7 +263,7 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent, if (it != controllers.end()) { - int idx = std::distance(it, controllers.begin()); + int idx = std::distance(controllers.begin(), it); m_userGroupBox->model()->setValue( true ); m_userController->model()->setValue( idx ); }