# HG changeset patch # User Mark Leigh mark.leigh@shaw.ca # Date 1608709402 28800 #      Tue Dec 22 23:43:22 2020 -0800 # Node ID d63cd8bc20c2d220465df2494389e20daba6adf9 # Parent  52a228182876f1d79d11684d00f9c5dffd503c6c Fixed Canadian RR.com search county names. Fixes #8579

user: Mark Leigh mark.leigh@shaw.ca branch 'default' changed chirp/ui/mainapp.py

The Canadian Radioreference.com import/query feature does not properly check which province is selected. This results in counties with the same name in two different provinces returning erroneous data. This is the fix.

diff --git a/chirp/ui/mainapp.py b/chirp/ui/mainapp.py --- a/chirp/ui/mainapp.py +++ b/chirp/ui/mainapp.py @@ -1480,7 +1480,8 @@

code = provinces[province.get_active_text()]          for row in clist:  # this is absolutely not the right way to do this! -            if row[3] == county.get_active_text(): +            if row[3] == county.get_active_text() and \ +                    row[1] == province.get_active_text():                  county_id = row[2]          CONF.set("province", str(code), "radioreference")          CONF.set("county", str(county_id), "radioreference")