DeviceUISet: fixed deleteChannel. Fixes issue #625

pull/638/head
f4exb 2020-09-10 22:42:36 +02:00
rodzic 308b870063
commit 1e0be6a6f7
2 zmienionych plików z 2 dodań i 3 usunięć

Wyświetl plik

@ -171,7 +171,6 @@ void DeviceUISet::deleteChannel(int channelIndex)
qPrintable(m_channelInstanceRegistrations[channelIndex].m_channelName),
channelIndex);
m_channelInstanceRegistrations[channelIndex].m_gui->destroy();
m_channelInstanceRegistrations.removeAt(channelIndex);
renameChannelInstances();
}
}

Wyświetl plik

@ -2174,9 +2174,9 @@ int WebAPIAdapterGUI::devicesetChannelDelete(
else
{
error.init();
*error.getMessage() = QString("There is no channel at index %1. There are %2 channels")
*error.getMessage() = QString("There is no channel at index %1. %2 channel(s) left")
.arg(channelIndex)
.arg(channelIndex < deviceSet->getNumberOfChannels());
.arg(deviceSet->getNumberOfChannels());
return 400;
}
}