fix: some small fixes

This commit is contained in:
Qv2ray-dev 2020-06-11 23:10:26 +08:00
parent d7193e4ba6
commit 34982a747b
4 changed files with 5 additions and 5 deletions

View File

@ -1 +1 @@
5568 5569

View File

@ -279,7 +279,7 @@ namespace Qv2ray::components::plugins
if (plugin.isLoaded && plugin.metadata.SpecialPluginType.contains(SPECIAL_TYPE_SERIALIZOR)) if (plugin.isLoaded && plugin.metadata.SpecialPluginType.contains(SPECIAL_TYPE_SERIALIZOR))
{ {
auto serializer = plugin.pluginInterface->GetSerializer(); auto serializer = plugin.pluginInterface->GetSerializer();
if (serializer->OutboundProtocols().contains(protocol)) if (serializer && serializer->OutboundProtocols().contains(protocol))
{ {
auto info = serializer->GetOutboundInfo(protocol, o); auto info = serializer->GetOutboundInfo(protocol, o);
*status = true; *status = true;
@ -301,7 +301,7 @@ namespace Qv2ray::components::plugins
if (plugin.isLoaded && plugin.metadata.SpecialPluginType.contains(SPECIAL_TYPE_SERIALIZOR)) if (plugin.isLoaded && plugin.metadata.SpecialPluginType.contains(SPECIAL_TYPE_SERIALIZOR))
{ {
auto serializer = plugin.pluginInterface->GetSerializer(); auto serializer = plugin.pluginInterface->GetSerializer();
if (serializer->OutboundProtocols().contains(protocol)) if (serializer && serializer->OutboundProtocols().contains(protocol))
{ {
auto link = serializer->SerializeOutbound(protocol, alias, groupName, outboundSettings); auto link = serializer->SerializeOutbound(protocol, alias, groupName, outboundSettings);
*status = true; *status = true;

@ -1 +1 @@
Subproject commit 9f305d4f352c1f28cc53cf39931e12b286fc3f1c Subproject commit 8425a473155b8e914a092712495a48978fe63c26

View File

@ -325,7 +325,7 @@ void PreferencesWindow::on_buttonBox_accepted()
} }
SaveGlobalSettings(CurrentConfig); SaveGlobalSettings(CurrentConfig);
UIMessageBus.EmitGlobalSignal(QvMBMessage::UPDATE_COLORSCHEME); UIMessageBus.EmitGlobalSignal(QvMBMessage::UPDATE_COLORSCHEME);
if (NeedRestart) if (NeedRestart && !KernelInstance->CurrentConnection().isEmpty())
{ {
this->setEnabled(false); this->setEnabled(false);
qApp->processEvents(); qApp->processEvents();