Merge remote-tracking branch 'remotes/origin/dev' into feature/new-gui
This commit is contained in:
commit
d0c9c1043c
179 changed files with 3824 additions and 4107 deletions
|
@ -7,7 +7,7 @@
|
|||
#include <QTimer>
|
||||
#include <functional>
|
||||
#include "../uilogic.h"
|
||||
#include "defines.h"
|
||||
#include "version.h"
|
||||
#include <configurators/vpn_configurator.h>
|
||||
|
||||
|
||||
|
@ -80,7 +80,6 @@ void VpnLogic::onUpdatePage()
|
|||
set_labelCurrentDns(dns.first + ", " + dns.second);
|
||||
}
|
||||
|
||||
|
||||
set_isContainerSupportedByCurrentPlatform(ContainerProps::isSupportedByCurrentPlatform(selectedContainer));
|
||||
if (!isContainerSupportedByCurrentPlatform()) {
|
||||
set_labelErrorText(tr("AmneziaVPN not supporting selected protocol on this device. Select another protocol."));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue