diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index eb187495..127482e3 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -5840 \ No newline at end of file +5841 diff --git a/src/ui/editors/w_RoutesEditor.cpp b/src/ui/editors/w_RoutesEditor.cpp index cc35c395..a8d06a58 100644 --- a/src/ui/editors/w_RoutesEditor.cpp +++ b/src/ui/editors/w_RoutesEditor.cpp @@ -93,6 +93,7 @@ RouteEditor::RouteEditor(QJsonObject connection, QWidget *parent) : QvDialog(par connect(nodeDispatcher.get(), &NodeDispatcher::OnRuleCreated, this, &RouteEditor::OnDispatcherRuleCreated); connect(nodeDispatcher.get(), &NodeDispatcher::OnInboundOutboundNodeHovered, this, &RouteEditor::OnDispatcherInboundOutboundHovered); connect(nodeDispatcher.get(), &NodeDispatcher::RequestEditChain, this, &RouteEditor::OnDispatcherEditChainRequested); + connect(nodeDispatcher.get(), &NodeDispatcher::OnObjectTagChanged, this, &RouteEditor::OnDispatcherObjectTagChanged); // { // @@ -166,7 +167,8 @@ void RouteEditor::OnDispatcherInboundOutboundHovered(const QString &tag, const P void RouteEditor::OnDispatcherOutboundCreated(std::shared_ptr out, QtNodes::Node &) { - defaultOutboundCombo->addItem(out->getDisplayName()); + if (out->metaType != METAOUTBOUND_BALANCER) + defaultOutboundCombo->addItem(out->getDisplayName()); } void RouteEditor::OnDispatcherRuleCreated(std::shared_ptr rule, QtNodes::Node &) @@ -203,7 +205,7 @@ void RouteEditor::OnDispatcherObjectTagChanged(ComplexTagNodeMode t, const QStri else if (t == NODE_OUTBOUND) { const auto id = defaultOutboundCombo->findText(original); - if (id > 0) + if (id >= 0) defaultOutboundCombo->setItemText(id, current); } } @@ -453,7 +455,11 @@ void RouteEditor::on_domainStrategyCombo_currentIndexChanged(const QString &arg1 void RouteEditor::on_defaultOutboundCombo_currentTextChanged(const QString &arg1) { LOADINGCHECK - // defaultOutbound = arg1; + if (defaultOutboundTag != arg1) + { + LOG(MODULE_UI, "Default outbound changed: " + arg1) + defaultOutboundTag = arg1; + } } void RouteEditor::on_importExistingBtn_clicked() diff --git a/src/ui/editors/w_RoutesEditor.hpp b/src/ui/editors/w_RoutesEditor.hpp index 391a7907..a9507dbf 100644 --- a/src/ui/editors/w_RoutesEditor.hpp +++ b/src/ui/editors/w_RoutesEditor.hpp @@ -70,6 +70,7 @@ class RouteEditor void OnDispatcherObjectTagChanged(ComplexTagNodeMode, const QString, const QString); private: + QString defaultOutboundTag; std::shared_ptr nodeDispatcher; ChainEditorWidget *chainWidget; RoutingEditorWidget *ruleWidget;