# HG changeset patch
# User Laurent Bessard
# Date 1365761540 -7200
# Node ID 474484781eacf7cea219f5103e878b94e385cdbf
# Parent  4e44c2c3e0813a905ef03a2fdaca5997a21901ed# Parent  0ddbc39c91eea471fb10c0f9952d796c782f48f5
Merged

diff -r 0ddbc39c91ee -r 474484781eac Beremiz_service.py
--- a/Beremiz_service.py	Wed Apr 10 20:47:59 2013 +0200
+++ b/Beremiz_service.py	Fri Apr 12 12:12:20 2013 +0200
@@ -488,6 +488,7 @@
             self.servicepublisher.RegisterService(self.servicename, self.ip_addr, self.port)
         
         if self.autostart:
+            self.plcobj.LoadPLC()
             self.plcobj.StartPLC()
         
         sys.stdout.flush()
diff -r 0ddbc39c91ee -r 474484781eac runtime/PLCObject.py
--- a/runtime/PLCObject.py	Wed Apr 10 20:47:59 2013 +0200
+++ b/runtime/PLCObject.py	Fri Apr 12 12:12:20 2013 +0200
@@ -122,7 +122,7 @@
         return os.path.join(self.workingdir,self.CurrentPLCFilename)
 
 
-    def _LoadNewPLC(self):
+    def LoadPLC(self):
         """
         Load PLC library
         Declare all functions, arguments and return values
@@ -209,7 +209,7 @@
         """
         self.PLClibraryLock.acquire()
         # Forget all refs to library
-        self._startPLC = lambda:None
+        self._startPLC = lambda x,y:None
         self._stopPLC = lambda:None
         self._ResetDebugVariables = lambda:None
         self._RegisterDebugVariable = lambda x, y:None
@@ -400,7 +400,7 @@
                 PLCprint(traceback.format_exc())
                 return False
 
-            if self._LoadNewPLC():
+            if self.LoadPLC():
                 self.PLCStatus = "Stopped"
                 try:
                     self.PythonRuntimeInit()