From b8fe0e6743021f5adbb6eb0c665349b0bf1e5676 Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Mon, 4 May 2015 03:12:55 -0500 Subject: [PATCH] Fix escape issue causing SAL to fail And don't uppercase the line...DOH! --- src/effects/nyquist/Nyquist.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index 8cc574a12..d4e0f4c22 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -909,8 +909,7 @@ bool NyquistEffect::ProcessOne() } if (mIsSal) { - wxString str = mCmd; - EscapeString(str); + wxString str = EscapeString(mCmd); // this is tricky: we need SAL to call main so that we can get a // SAL traceback in the event of an error (sal-compile catches the // error and calls sal-error-output), but SAL does not return values. @@ -1493,7 +1492,7 @@ bool NyquistEffect::ParseProgram(wxInputStream & stream) { mIsSal = false; } - else if (line.MakeUpper().Find(wxT("RETURN")) != wxNOT_FOUND) + else if (line.Upper().Find(wxT("RETURN")) != wxNOT_FOUND) { mIsSal = true; }