wxGUI/colorrules: fix OnOK when preview is updated after window is de…

…stroyed (#443)

gui/wxpython/modules/colorrules.py

@@ -611,6 +611,9 @@ def OnCloseWindow(self, event):
         self.OnCancel(event)
 
     def OnApply(self, event):
+        return self._apply()
+
+    def _apply(self, updatePreview=True):
         """Apply selected color table
 
         :return: True on success otherwise False
@@ -620,7 +623,8 @@ def OnApply(self, event):
             GMessage(parent=self, message=_("No valid color rules given."))
         else:
             # re-render preview and current map window
-            self.OnPreview(None)
+            if updatePreview:
+                self.OnPreview(None)
             display = self.layerTree.GetMapDisplay()
             if display and display.IsAutoRendered():
                 display.GetWindow().UpdateMap(render=True)
@@ -629,7 +633,7 @@ def OnApply(self, event):
 
     def OnOK(self, event):
         """Apply selected color table and close the dialog"""
-        if self.OnApply(event):
+        if self._apply(updatePreview=False):
             self.OnCancel(event)
 
     def OnCancel(self, event):
@@ -1846,7 +1850,7 @@ def OnCancel(self, event):
         self.Map.Clean()
         self.Destroy()
 
-    def OnApply(self, event):
+    def _apply(self, updatePreview=True):
         """Apply selected color table
 
         :return: True on success otherwise False
@@ -1861,7 +1865,7 @@ def OnApply(self, event):
 
             self.UseAttrColumn(True)
 
-        return ColorTable.OnApply(self, event)
+        return ColorTable._apply(self, updatePreview)
 
 
 class ThematicVectorTable(VectorColorTable):
@@ -1880,7 +1884,7 @@ def _initLayer(self):
         self.selectionInput.SetValue(self.inmap)
         self.selectionInput.Disable()
 
-    def OnApply(self, event):
+    def _apply(self, updatePreview=True):
         """Apply selected color table
 
         :return: True on success otherwise False