Skip to content

Load client settings before --connect startup #3738

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
softins merged 1 commit into from
Jun 16, 2026
+7 −11
Merged

Load client settings before --connect startup #3738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 0 additions & 8 deletions src/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
/* Implementation *************************************************************/
CClient::CClient ( const quint16 iPortNumber,
const quint16 iQosNumber,
const QString& strConnOnStartupAddress,
const bool bNoAutoJackConnect,
const QString& strNClientName,
const bool bNDisableIPv6,
Expand Down Expand Up @@ -212,13 +211,6 @@ CClient::CClient ( const quint16 iPortNumber,
// start the socket (it is important to start the socket after all
// initializations and connections)
Socket.Start();

// do an immediate start if a server address is given
if ( !strConnOnStartupAddress.isEmpty() )
{
SetServerAddr ( strConnOnStartupAddress );
Start();
}
}

// MIDI setup will be handled after settings are assigned
Expand Down
1 change: 0 additions & 1 deletion src/client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ class CClient : public QObject
public:
CClient ( const quint16 iPortNumber,
const quint16 iQosNumber,
const QString& strConnOnStartupAddress,
const bool bNoAutoJackConnect,
const QString& strNClientName,
const bool bNDisableIPv6,
Expand Down
9 changes: 7 additions & 2 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,8 +951,7 @@ int main ( int argc, char** argv )
#ifndef SERVER_ONLY
if ( bIsClient )
{
CClient
Client ( iPortNumber, iQosNumber, strConnOnStartupAddress, bNoAutoJackConnect, strClientName, bDisableIPv6, bMuteMeInPersonalMix );
CClient Client ( iPortNumber, iQosNumber, bNoAutoJackConnect, strClientName, bDisableIPv6, bMuteMeInPersonalMix );

// Create Settings with the client pointer
CClientSettings Settings ( &Client, strIniFileName );
Expand Down Expand Up @@ -988,6 +987,12 @@ int main ( int argc, char** argv )
else
# endif
{
if ( !strConnOnStartupAddress.isEmpty() )

@softins softins Jun 15, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks like the wrong place to insert this code. Originally, the -c option worked in both GUI and headless modes. Putting it at this location makes it only work in headless mode.

I think the best place to move it to would be up a few lines to just before the #ifndef HEADLESS around line 968. That is after the settings have been loaded, but before the GUI is loaded (if any).

Otherwise if that doesn't fix your issue, move it down a few lines to around line 1001, just before the end of the if ( bIsClient ) block.

@softins softins Jun 15, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah, looks like you're correct here. I've only just noticed that CClientDlg handles the connect-at-startup when in GUI mode.

So disregard the above comment. But The CClient constructor still needs the other change.

@seanogdelaney seanogdelaney Jun 15, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Thanks - cleaned up that code.
Also clarified the PR summary.

{
Client.SetServerAddr ( strConnOnStartupAddress );
Client.Start();
}

// only start application without using the GUI
qInfo() << qUtf8Printable ( GetVersionAndNameStr ( false ) );

Expand Down
Loading