summaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorkali kaneko (leap communications) <kali@leap.se>2021-12-01 21:55:28 +0100
committerkali kaneko (leap communications) <kali@leap.se>2021-12-01 22:25:46 +0100
commitf91114578c73e0ce4e417ae1344a64eed31e08ea (patch)
treed369587e83a940fff30220000f0958320bf8bc29 /gui
parent81bc89e89404761d2fd15093f7f7ad209784e36a (diff)
[feat] disable autostart
we've agreed that the autostart behaviour can be unexpected; we'll expose the ability under preferences (it can be controlled via cli right now).
Diffstat (limited to 'gui')
-rw-r--r--gui/backend.go2
-rw-r--r--gui/main.cpp20
2 files changed, 11 insertions, 11 deletions
diff --git a/gui/backend.go b/gui/backend.go
index 516ef4a..5feb6d4 100644
--- a/gui/backend.go
+++ b/gui/backend.go
@@ -87,7 +87,6 @@ func SubscribeToEvent(event string, f unsafe.Pointer) {
func InitializeBitmaskContext(provider string,
jsonPtr unsafe.Pointer, jsonLen C.int,
obfs4 bool, disableAutostart bool, startVPN string) {
-
json := C.GoBytes(jsonPtr, jsonLen)
opts := backend.InitOptsFromJSON(provider, string(json))
opts.Obfs4 = obfs4
@@ -98,6 +97,7 @@ func InitializeBitmaskContext(provider string,
//export InitializeTestBitmaskContext
func InitializeTestBitmaskContext(provider string,
+
jsonPtr unsafe.Pointer, jsonLen C.int) {
json := C.GoBytes(jsonPtr, jsonLen)
opts := backend.InitOptsFromJSON(provider, string(json))
diff --git a/gui/main.cpp b/gui/main.cpp
index 5a265eb..b4051b2 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -124,10 +124,10 @@ int main(int argc, char **argv) {
"Use obfs4 to obfuscate the traffic, if available in the provider."),
},
{
- {"a", "disable-autostart"},
+ {"a", "enable-autostart"},
QApplication::translate(
"main",
- "Disable autostart for the next run."),
+ "Enable autostart."),
},
});
QCommandLineOption webPortOption("web-port", QApplication::translate("main", "Web API port (default: 8080)"), "port", "8080");
@@ -137,14 +137,14 @@ int main(int argc, char **argv) {
parser.addOption(startVPNOption);
parser.process(app);
- bool hideSystray = parser.isSet("no-systray");
+ bool hideSystray = parser.isSet("no-systray");
bool availableSystray = true;
- bool installHelpers = parser.isSet("install-helpers");
- bool webAPI = parser.isSet("web-api");
- QString webPort = parser.value("web-port");
- bool version = parser.isSet("version");
- bool obfs4 = parser.isSet("obfs4");
- bool disAutostart = parser.isSet("disable-autostart");
+ bool installHelpers = parser.isSet("install-helpers");
+ bool webAPI = parser.isSet("web-api");
+ QString webPort = parser.value("web-port");
+ bool version = parser.isSet("version");
+ bool obfs4 = parser.isSet("obfs4");
+ bool enableAutostart = parser.isSet("enable-autostart");
QString startVPN = parser.value("start-vpn");
if (version) {
@@ -240,7 +240,7 @@ int main(int argc, char **argv) {
InitializeBitmaskContext(
toGoStr(defaultProvider.toString()),
(char*)providerJsonBytes.data(), providerJsonBytes.length(),
- obfs4, disAutostart, toGoStr(startVPN));
+ obfs4, !enableAutostart, toGoStr(startVPN));
/* if requested, enable web api for controlling the VPN */
if (webAPI)