Skip to content

Commit

Permalink
refs #5103. Fix error in MantidPlot executeandquit
Browse files Browse the repository at this point in the history
  • Loading branch information
OwenArnold committed Apr 30, 2012
1 parent 9d2659d commit 6456f97
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions Code/Mantid/MantidPlot/src/ApplicationWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -514,9 +514,13 @@ void ApplicationWindow::trySetParaviewPath(const QStringList& commandArguments)
}
}

//If the ignore property exists and is set to true, then skip the dialog.
const std::string paraviewIgnoreProperty = "paraview.ignore";
b_skipDialog = confService.hasProperty(paraviewIgnoreProperty) && QString(confService.getString(paraviewIgnoreProperty).c_str()).toInt() == true;
//ONLY If skipping is not already selected
if(!b_skipDialog)
{
//If the ignore property exists and is set to true, then skip the dialog.
const std::string paraviewIgnoreProperty = "paraview.ignore";
b_skipDialog = confService.hasProperty(paraviewIgnoreProperty) && QString(confService.getString(paraviewIgnoreProperty).c_str()).toInt() == true;
}

if(this->hasParaviewPath())
{
Expand Down

0 comments on commit 6456f97

Please sign in to comment.