removed crash calling ParameterSet's join

This commit is contained in:
Guido Ranzuglia granzuglia 2010-03-24 11:47:32 +00:00
parent cf999ac993
commit 60bcc0d402

View File

@ -467,7 +467,7 @@ void MainWindow::executeFilter(QAction *action, RichParameterSet &params, 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();