Skip to content

Only setup controller devices after UI has loaded to prevent control object dependency loop #4651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ronso0 merged 3 commits into from
Mar 14, 2023
Merged

Only setup controller devices after UI has loaded to prevent control object dependency loop #4651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0cdcdd
Only setup controller devices after UI has loaded to prevent control …
ywwg Jan 29, 2022
c7a56a0
Merge branch 'main' into controllers-after-window
ywwg Mar 18, 2022
8508269
controllers after window: fix includes for qt6 / qml
ywwg Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/coreservices.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,10 +369,6 @@ void CoreServices::initialize(QApplication* pApp) {
qDebug() << "Creating ControllerManager";
m_pControllerManager = std::make_shared<ControllerManager>(pConfig);

// Wait until all other ControlObjects are set up before initializing
// controllers
m_pControllerManager->setUpDevices();

// Scan the library for new files and directories
bool rescan = pConfig->getValue<bool>(
ConfigKey("[Library]", "RescanOnStartup"));
Expand Down
2 changes: 2 additions & 0 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <QtDebug>

#include "config.h"
#include "controllers/controllermanager.h"
#include "coreservices.h"
#include "errordialoghandler.h"
#include "mixxxapplication.h"
Expand Down Expand Up @@ -57,6 +58,7 @@ int runMixxx(MixxxApplication* pApp, const CmdlineArgs& args) {
&MixxxMainWindow::initializationProgressUpdate);
pCoreServices->initialize(pApp);
mainWindow.initialize();
pCoreServices->getControllerManager()->setUpDevices();
Copy link
Copy Markdown
Member Author

@ywwg ywwg Jan 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line could alternatively go in mixxxmainwindow

Copy link
Copy Markdown
Member

@daschuer daschuer Jan 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least there is an asymetie for the QMl and widget case. Can we move both to main, or do we have a good reason for the current places?


// If startup produced a fatal error, then don't even start the
// Qt event loop.
Expand Down
3 changes: 3 additions & 0 deletions src/qml/qmlapplication.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <QtQml/qqmlextensionplugin.h>

#include "control/controlsortfiltermodel.h"
#include "controllers/controllermanager.h"
#include "moc_qmlapplication.cpp"
#include "qml/asyncimageprovider.h"
#include "qml/qmlconfigproxy.h"
Expand Down Expand Up @@ -86,6 +87,8 @@ QmlApplication::QmlApplication(

loadQml(m_mainFilePath);

pCoreServices->getControllerManager()->setUpDevices();
Comment thread
ronso0 marked this conversation as resolved.

connect(&m_fileWatcher,
&QFileSystemWatcher::fileChanged,
this,
Expand Down