From 60bcc0d402d0602311bf82fd0f1d570652c8f8a8 Mon Sep 17 00:00:00 2001 From: Guido Ranzuglia granzuglia Date: Wed, 24 Mar 2010 11:47:32 +0000 Subject: [PATCH] removed crash calling ParameterSet's join --- src/meshlab/mainwindow_RunTime.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index cc39a273b..7dd422c5c 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -467,7 +467,7 @@ void MainWindow::executeFilter(QAction *action, RichParameterSet ¶ms, bool i QTime tt; tt.start(); GLA()->meshDoc.busy=true; RichParameterSet MergedEnvironment(params); - MergedEnvironment.paramList.append(currentGlobalParams.paramList); + MergedEnvironment.join(currentGlobalParams); ret=iFilter->applyFilter(action, GLA()->meshDoc, MergedEnvironment, QCallBack); GLA()->meshDoc.busy=false; qApp->restoreOverrideCursor();