From a16fc52bc776d5d015c576e43472b838b2323355 Mon Sep 17 00:00:00 2001 From: Marat Fayzullin Date: Sun, 4 Jun 2023 12:34:16 -0400 Subject: [PATCH] Fixing merge issue. --- owrx/connection.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/owrx/connection.py b/owrx/connection.py index 36f57094..2fcba23e 100644 --- a/owrx/connection.py +++ b/owrx/connection.py @@ -303,13 +303,13 @@ class OpenWebRxReceiverClient(OpenWebRxClient, SdrSourceEventClient): magic = self.stack["magic_key"] key = params["key"] if "key" in params else None self.setSdr(profile[0]) + # If source not locked, or no magic key, or it matches... if not self.sdr.isLocked() or magic == "" or key == magic: + # Select a new profile self.sdr.activateProfile(profile[1]) -<<<<<<< HEAD else: + # Force update back to the current profile self.sdr.activateProfile(self.sdr.getProfileId(), force=True) -======= ->>>>>>> 10673b4d1eb49ad8d948d7fd31f2165643cabaa8 elif message["type"] == "setfrequency": # If the magic key is set in the settings, only allow # changes if it matches the received key