dan9i10/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-05-08 14:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed conf

Browse Source
This commit is contained in:
dranik
2026-05-04 14:08:47 +03:00
parent 4b1a0c0788
commit ef82b589c8
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/core/models/protocols/xrayProtocolConfig.cpp
View File

@@ -287,7 +287,10 @@ XrayClientConfig XrayClientConfig::fromJson(const QJsonObject &json)
if (vnextObj.contains(protocols::xray::users)) {
QJsonArray users = vnextObj[protocols::xray::users].toArray();
if (!users.isEmpty()) {
c.id = users[0].toObject().value(protocols::xray::id).toString();
QJsonObject user = users[0].toObject();
if (user.contains(protocols::xray::id)) {
c.id = user[protocols::xray::id].toString();
}
}
}
}
@@ -335,8 +338,10 @@ XrayProtocolConfig XrayProtocolConfig::fromJson(const QJsonObject &json)
if (parsed.contains(protocols::xray::inbounds)) {
QJsonArray inbounds = parsed.value(protocols::xray::inbounds).toArray();
if (!inbounds.isEmpty()) {
clientCfg.localPort = QString::number(
inbounds[0].toObject().value(protocols::xray::port).toInt());
QJsonObject inbound = inbounds[0].toObject();
if (inbound.contains(protocols::xray::port)) {
clientCfg.localPort = QString::number(inbound.value(protocols::xray::port).toInt());
}
}
}
c.clientConfig = clientCfg;

6
client/ui/models/protocols/xrayConfigModel.cpp
View File

@@ -344,8 +344,10 @@ void XrayConfigModel::applyDefaultsToServerConfig(amnezia::XrayServerConfig &con
amnezia::XrayProtocolConfig XrayConfigModel::getProtocolConfig()
{
if (!m_protocolConfig.serverConfig.hasEqualServerSettings(m_originalProtocolConfig.serverConfig))
{
const bool serverSettingsChanged =
!m_protocolConfig.serverConfig.hasEqualServerSettings(m_originalProtocolConfig.serverConfig);
if (serverSettingsChanged) {
m_protocolConfig.clearClientConfig();
}
return m_protocolConfig;