diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index 2dc33761..6412dc25 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -5264 \ No newline at end of file +5266 \ No newline at end of file diff --git a/src/ui/editors/w_OutboundEditor.cpp b/src/ui/editors/w_OutboundEditor.cpp index 21724205..40b426fd 100644 --- a/src/ui/editors/w_OutboundEditor.cpp +++ b/src/ui/editors/w_OutboundEditor.cpp @@ -118,6 +118,7 @@ OUTBOUND OutboundEditor::GenerateConnectionJson() } else { + streaming = QJsonObject(); bool processed = false; for (const auto &plugin : pluginWidgets) { @@ -204,6 +205,8 @@ void OutboundEditor::ReloadGUI() const auto &plugin = pluginWidgets.value(index); if (plugin.first.protocol == outboundType) { + useFPCB->setEnabled(false); + useFPCB->setToolTip(tr("Forward proxy has been disabled when using plugin outbound")); plugin.second->SetContent(settings); outBoundTypeCombo->setCurrentIndex(index); auto [_address, _port] = plugin.second->GetHostInfo(); @@ -284,12 +287,14 @@ void OutboundEditor::on_alterLineEdit_valueChanged(int arg1) void OutboundEditor::on_useFPCB_stateChanged(int arg1) { useForwardProxy = arg1 == Qt::Checked; + streamSettingsWidget->setEnabled(!useForwardProxy); } void OutboundEditor::on_outBoundTypeCombo_currentIndexChanged(int index) { // 0, 1, 2 as built-in vmess, ss, socks outboundTypeStackView->setCurrentIndex(index); + streamSettingsWidget->setEnabled(index < 3); if (index < 3) { outboundType = outBoundTypeCombo->currentText().toLower(); diff --git a/src/ui/editors/w_OutboundEditor.ui b/src/ui/editors/w_OutboundEditor.ui index 35f307f2..3d5d3dde 100644 --- a/src/ui/editors/w_OutboundEditor.ui +++ b/src/ui/editors/w_OutboundEditor.ui @@ -30,7 +30,7 @@ - + Stream Settings