summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2020-11-12 15:52:46 +0100
committerUwe Klotz <uklotz@mixxx.org>2020-11-12 15:52:46 +0100
commit4ab3f5aec54dd1b20ac28e6a1be97449df1c7283 (patch)
tree156c7946d5baf91e41608001e60ede4d4a9d5d6b /src/control
parent05d9182ca02a6ccd3f455c72cf949ba2463be2c7 (diff)
parentc17ad0f76695fdab57ee66efe379e5081729d970 (diff)
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into main
# Conflicts: # src/engine/controls/cuecontrol.cpp # src/library/library.cpp
Diffstat (limited to 'src/control')
-rw-r--r--src/control/controlobjectscript.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/control/controlobjectscript.cpp b/src/control/controlobjectscript.cpp
index 8465336bf0..b7cbfd0194 100644
--- a/src/control/controlobjectscript.cpp
+++ b/src/control/controlobjectscript.cpp
@@ -22,7 +22,7 @@ bool ControlObjectScript::addScriptConnection(const ScriptConnection& conn) {
Qt::QueuedConnection);
}
- for (const auto& priorConnection: m_scriptConnections) {
+ for (const auto& priorConnection : qAsConst(m_scriptConnections)) {
if (conn == priorConnection) {
qWarning() << "Connection " + conn.id.toString() +
" already connected to (" +