--- a/Beremiz.py	Mon Mar 11 19:17:56 2013 +0900
+++ b/Beremiz.py	Mon Mar 11 14:49:17 2013 +0100
@@ -878,7 +878,8 @@
                 self.RefreshConfigRecentProjects(projectpath)
                 if self.EnableDebug:
                     self.DebugVariablePanel.SetDataProducer(self.CTR)
-                self.LoadProjectLayout()
+                if self.EnableSaveProjectState():
+                    self.LoadProjectLayout()
                 self._Refresh(PROJECTTREE, POUINSTANCEVARIABLESPANEL, LIBRARYTREE)
             else:
                 self.ResetView()

--- a/canfestival/canfestival.py	Mon Mar 11 19:17:56 2013 +0900
+++ b/canfestival/canfestival.py	Mon Mar 11 14:49:17 2013 +0100
@@ -399,12 +399,15 @@
                         child["type"] = local_canfestival_config.DLL_LIST
         return infos
     
-    def CTNGenerate_C(self, buildpath, locations):
+    def GetCanDriver(self):
         can_driver = self.CanFestivalInstance.getCAN_Driver()
         if not can_driver :
             can_driver = local_canfestival_config.DLL_LIST[0]
         can_drv_ext = self.GetCTRoot().GetBuilder().extension
-        can_driver_name = "libcanfestival_" + can_driver + can_drv_ext
+        return "libcanfestival_" + can_driver + can_drv_ext
+        
+    def CTNGenerate_C(self, buildpath, locations):
+        can_driver_name = self.GetCanDriver()
         
         format_dict = {"locstr" : "_".join(map(str,self.GetCurrentLocation())),
                        "candriver" : can_driver_name,
@@ -500,10 +503,11 @@
         f.close()
 
         res = [(cf_main_path, local_canfestival_config.getCFLAGS(CanFestivalPath))],local_canfestival_config.getLDFLAGS(CanFestivalPath), True
-
-        can_driver_path = os.path.join(CanFestivalPath,"drivers",can_driver,can_driver_name)
-        if os.path.exists(can_driver_path):
-            res += ((can_driver_name, file(can_driver_path,"rb")),)
+        
+        if can_driver_name:
+            can_driver_path = os.path.join(CanFestivalPath,"drivers",can_driver,can_driver_name)
+            if os.path.exists(can_driver_path):
+                res += ((can_driver_name, file(can_driver_path,"rb")),)
 
         return res