Fix for the GUI settings not applying immediately (#8340)

Tribler · Dec 13, 2024 · 96f5891 · 96f5891
2 parents e5dd276 + 931664c
commit 96f5891
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/tribler/core/tunnel/community.py b/src/tribler/core/tunnel/community.py
@@ -51,7 +51,14 @@ def is_bencoded(x: bytes) -> bool:
     """
     Returns True is x appears to be valid bencoded byte string.
     """
-    return bdecode(x) is not None
+    if not isinstance(x, bytes):
+        msg = f'Expected bytes, got {type(x).__name__}'
+        raise TypeError(msg)
+    try:
+        decoded = bdecode(x)
+    except RuntimeError:
+        decoded = None
+    return decoded is not None
 
 
 class TriblerTunnelSettings(HiddenTunnelSettings):

diff --git a/src/tribler/ui/src/services/tribler.service.ts b/src/tribler/ui/src/services/tribler.service.ts
@@ -294,7 +294,7 @@ export class TriblerService {
 
     async setSettings(settings: Partial<Settings>): Promise<undefined | ErrorDict | boolean> {
         try {
-            this.guiSettings = {...settings?.ui, ...this.guiSettings};
+            this.guiSettings = {...this.guiSettings, ...settings?.ui};
             return (await this.http.post('/settings', settings)).data.modified;
         } catch (error) {
             return formatAxiosError(error as Error | AxiosError);