# HG changeset patch
# User Edouard Tisserant
# Date 1333593721 -7200
# Node ID f8ee6fd01f7cd546410fc83614aed2a539855644
# Parent  37dc330e96a29e4c52b4ac5b0c34deaa6aeb00e4# Parent  5a036ae4d6aa848e1062c07235528191f107f4c6
branch merge

diff -r 37dc330e96a2 -r f8ee6fd01f7c Beremiz.py
--- a/Beremiz.py	Thu Apr 05 04:41:22 2012 +0200
+++ b/Beremiz.py	Thu Apr 05 04:42:01 2012 +0200
@@ -1634,10 +1634,11 @@
             self.Config.Write("lastopenedfolder", os.path.dirname(projectpath))
             self.Config.Flush()
             self.ResetView()
-            self.PluginRoot = PluginsRoot(self, self.Log)
-            self.Controler = self.PluginRoot
-            result = self.PluginRoot.NewProject(projectpath)
+            plugin_root = PluginsRoot(self, self.Log)
+            result = plugin_root.NewProject(projectpath)
             if not result:
+                self.PluginRoot = plugin_root
+                self.Controler = self.PluginRoot
                 self.RefreshConfigRecentProjects(projectpath)
                 if self.EnableDebug:
                     self.DebugVariablePanel.SetDataProducer(self.PluginRoot)