# HG changeset patch
# User laurent
# Date 1329262202 -3600
# Node ID 97bed1acd8605bd40b3d1261fc713faea98e3cc7
# Parent  41782a92c2deb22cfb42f470987ea1797a8abb09
Fix bug when modifying Function Block instance type without changing name

diff -r 41782a92c2de -r 97bed1acd860 PLCControler.py
--- a/PLCControler.py	Wed Feb 15 00:29:02 2012 +0100
+++ b/PLCControler.py	Wed Feb 15 00:30:02 2012 +0100
@@ -2079,7 +2079,7 @@
                         self.RemoveEditedElementPouVar(tagname, old_type, old_name)
                     else:
                         self.AddEditedElementPouVar(tagname, new_type, new_name)
-                elif new_typeinfos["type"] != "function" and old_name != new_name:
+                elif new_typeinfos["type"] != "function":
                     self.ChangeEditedElementPouVar(tagname, old_type, old_name, new_type, new_name)
             elif new_name != old_name:
                 self.ChangeEditedElementPouVar(tagname, old_type, old_name, new_type, new_name)
diff -r 41782a92c2de -r 97bed1acd860 dialogs/FBDBlockDialog.py
--- a/dialogs/FBDBlockDialog.py	Wed Feb 15 00:29:02 2012 +0100
+++ b/dialogs/FBDBlockDialog.py	Wed Feb 15 00:30:02 2012 +0100
@@ -319,7 +319,6 @@
         return values
 
     def OnTypeTreeItemSelected(self, event):
-        self.BlockName.SetValue("")
         selected = event.GetItem()
         pydata = self.TypeTree.GetPyData(selected)
         if pydata["type"] != CATEGORY: