--- a/Beremiz_service.py	Mon Aug 10 14:42:54 2009 +0200
+++ b/Beremiz_service.py	Wed Aug 12 11:40:26 2009 +0200
@@ -549,7 +549,7 @@
         def HMIexec(self, function, *args, **kwargs):
             if self.HMI is not None:
                 getattr(self.HMI, function, lambda:None)(*args, **kwargs)
-        athena.expose(executeOnHMI)
+        athena.expose(HMIexec)
         
         def resetHMI(self):
             self.HMI = None
@@ -564,8 +564,8 @@
                 f = self.PLCStartedHMIClass()
             else:
                 f = PLCStoppedHMI()
+            f.setFragmentParent(self)
             self.HMI = f
-            f.setFragmentParent(self)
             return f
         athena.expose(getPLCElement)
 
@@ -593,10 +593,10 @@
         def getHMI(self):
             return self.MainPage.getHMI()
         
-        def LoadHMI(self, plc, jsmodules):
+        def LoadHMI(self, hmi, jsmodules):
             for name, path in jsmodules.iteritems():
                 self.jsModules.mapping[name] = os.path.join(WorkingDir, path)
-            self.MainPage.setPLCStarted(plc)
+            self.MainPage.setPLCStartedHMI(hmi)
         
         def UnLoadHMI(self):
             self.MainPage.resetPLCStartedHMI()