Skip to content

Commit

Permalink
- Fixed a bad/wrong set/remove of JACK metadata pretty-name propertie…
Browse files Browse the repository at this point in the history
…s. (REGRESSION)
  • Loading branch information
rncbc committed Nov 11, 2023
1 parent c07039d commit 5e14bff
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/qjackctlJackConnect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ void qjackctlJackPort::updatePortName ( bool bRename )
if (pJackPort) {
jack_uuid_t port_uuid = ::jack_port_uuid(pJackPort);
const QString& sPrettyName = prettyName(port_uuid);
if (sPortNameEx != sPortName || sPortNameEx != sPrettyName) {
if (sPrettyName.isEmpty() || sPortNameEx != sPortName || bRename) {
if (sPortNameEx != sPortName && sPortNameEx != sPrettyName) {
if (sPrettyName.isEmpty() || bRename) {
setPrettyName(pJackClient, port_uuid, sPortNameEx);
} else {
sPortNameEx = sPrettyName;
Expand Down Expand Up @@ -247,8 +247,8 @@ void qjackctlJackClient::updateClientName ( bool bRename )
jack_uuid_t client_uuid = 0;
::jack_uuid_parse(pszClientUuid, &client_uuid);
const QString& sPrettyName = prettyName(client_uuid);
if (sClientNameEx != sClientName || sClientNameEx != sPrettyName) {
if (sPrettyName.isEmpty() || sClientNameEx != sClientName || bRename) {
if (sClientNameEx != sClientName && sClientNameEx != sPrettyName) {
if (sPrettyName.isEmpty() || bRename) {
setPrettyName(pJackClient, client_uuid, sClientNameEx);
} else {
sClientNameEx = sPrettyName;
Expand Down

0 comments on commit 5e14bff

Please sign in to comment.