[bug] avoid inconsistent statesosx-fonts

2 files changed, 17 insertions, 3 deletions

diff --git a/gui/components/Preferences.qml b/gui/components/Preferences.qml
index 23aae05..546ff8b 100644
--- a/gui/components/Preferences.qml
+++ b/gui/components/Preferences.qml
@@ -248,15 +248,16 @@ ThemedPage {
     }
 
     Component.onCompleted: {
-        if (ctx && ctx.transport == "obfs4") {
-            useBridgesCheckBox.checked = true
-        }
         if (ctx && ctx.offersUdp == "false") {
             useUDP.enabled = false
         }
         if (ctx && ctx.offersUdp && ctx.udp == "true") {
             useUDP.checked = true
         }
+        if (ctx && ctx.transport == "obfs4") {
+            useBridgesCheckBox.checked = true
+            useUDP.enabled = false
+        }
         // disabled for now, will be on next release
         /*
         if (ctx && ctx.hasTor == "true") {
diff --git a/gui/main.qml b/gui/main.qml
index 116aba3..1424cc6 100644
--- a/gui/main.qml
+++ b/gui/main.qml
@@ -111,6 +111,9 @@ ApplicationWindow {
             if (ctx.donateDialog == 'true') {
                 showDonationReminder = true
             }
+            if (isAutoLocation()) {
+                root.selectedGateway = "auto"
+            }
 
             // TODO check donation
             //if (needsDonate && !shownDonate) {
@@ -149,6 +152,16 @@ ApplicationWindow {
         return Array.from(arr, (k,_) => k.key);
     }
 
+    function isAutoLocation() {
+        // FIXME there's something weird going on with newyork location...
+        // it gets marked as auto, which from europe is a bug.
+        let best = ctx.locationLabels[ctx.bestLocation]
+        if (best == undefined) {
+            return false
+        }
+        return (best[0] == ctx.currentLocation)
+    }
+
     function bringToFront() {
         // FIXME does not work properly, at least on linux 
         if (visibility == 3) {