fixes editing twice a service

opengisch · Sep 28, 2020 · e3ead81 · e3ead81
1 parent a569e95
commit e3ead81
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/geomapfish_locator/core/geomapfish_locator_plugin.py b/geomapfish_locator/core/geomapfish_locator_plugin.py
@@ -117,8 +117,10 @@ def unload(self):
         self.iface.invalidateLocatorResults()
         for menu_action in self.menu_actions:
             self.iface.removePluginMenu(self.plugin_name, menu_action)
+        del self.menu_actions[:]
         for locator_filter in self.locator_filters:
             self.iface.deregisterLocatorFilter(locator_filter)
+        self.locator_filters = {}
 
     def save_services(self):
         services = []
@@ -129,8 +131,10 @@ def save_services(self):
     def refresh_menu(self):
         for menu_action in self.menu_actions[1:]:
             self.iface.removePluginMenu(self.plugin_name, menu_action)
-        for locator_filter in self.locator_filters:
-            self.add_locator_menu_action(locator_filter)
+        del self.menu_actions[1:]
+        # use index based loop to avoid changing the variable used in the lambda !
+        for i in range(len(self.locator_filters)):
+            self.add_locator_menu_action(self.locator_filters[i])
 
     def show_settings(self, _):
         if GeomapfishSettingsDialog(self.iface.mainWindow()).exec_():

diff --git a/geomapfish_locator/core/locator_filter.py b/geomapfish_locator/core/locator_filter.py
@@ -86,7 +86,7 @@ def openConfigWidget(self, parent=None):
         cfg = FilterConfigurationDialog(self.service, parent)
         if cfg.exec_():
             self.service = cfg.service.clone()
-            self.crs = QgsCoordinateReferenceSystem(self.service.c
+            self.crs = QgsCoordinateReferenceSystem(self.service.crs)
             self.changed.emit()
 
     def reset_rubberband(self):