Skip to content

Commit

Permalink
- Hot-fixed a bd/wrong set/remove of JACK metadata pretty-name proper…
Browse files Browse the repository at this point in the history
…ties. (REGRESSION)
  • Loading branch information
rncbc committed Sep 9, 2023
1 parent f5759d2 commit 680f88f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/qjackctlJackConnect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ 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) {
removePrettyName(pJackClient, port_uuid);
if (sPortNameEx != sPortName && sPortNameEx != sPrettyName) {
if (sPrettyName.isEmpty() || bRename) {
setPrettyName(pJackClient, port_uuid, sPortNameEx);
} else {
sPortNameEx = sPrettyName;
setPortNameAlias(sPortNameEx);
Expand Down Expand Up @@ -247,9 +247,9 @@ 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) {
removePrettyName(pJackClient, client_uuid);
if (sClientNameEx != sClientName && sClientNameEx != sPrettyName) {
if (sPrettyName.isEmpty() || bRename) {
setPrettyName(pJackClient, client_uuid, sClientNameEx);
} else {
sClientNameEx = sPrettyName;
setClientNameAlias(sClientNameEx);
Expand Down

0 comments on commit 680f88f

Please sign in to comment.