# HG changeset patch
# User Roeland Merks <roeland.merks@cwi.nl>
# Date 2010-05-26 16:40:58
# Node ID 3663c597352b0a4f8ffbf90c311199c9b9d433e1
# Parent  0c49e452410f8650b93f988d5dd11e7e20991e59

Oh, oh... my previous solution to clean and then reconstruct a new initial condition did not work in all cases. Now I am calling Init(leaffile) during startup initialization only if the user is passing a leafML file during startup (-l option).

user: Roeland Merks <roeland.merks@cwi.nl>
branch 'default'
changed src/VirtualLeaf.cpp
changed src/modelcatalogue.cpp

diff --git a/src/VirtualLeaf.cpp b/src/VirtualLeaf.cpp
--- a/src/VirtualLeaf.cpp
+++ b/src/VirtualLeaf.cpp
@@ -508,8 +508,9 @@ int main(int argc,char **argv) {
       model_catalogue.PopulateModelMenu();
     model_catalogue.InstallFirstModel();
     
-    mesh.Clean();
-    main_window->Init(leaffile);
+
+    if (leaffile) 
+      main_window->Init(leaffile);
 	  
     Cell::SetMagnification(1);
     Cell::setOffset(0,0);
diff --git a/src/modelcatalogue.cpp b/src/modelcatalogue.cpp
--- a/src/modelcatalogue.cpp
+++ b/src/modelcatalogue.cpp
@@ -113,7 +113,7 @@ void ModelCatalogue::LoadPlugin(const ch
     if (SimPluginInterface *plugin = 
 	qobject_cast<SimPluginInterface *>(loader.instance())) {
       models.append(plugin); 
-      MyWarning::warning("Successfully loaded model %s",fileName.toStdString().c_str());
+      //MyWarning::warning("Successfully loaded model %s",fileName.toStdString().c_str());
     } else {
       MyWarning::warning("Could not load plugin %s",fileName.toStdString().c_str());
     }