From 8da8c742d20a3e1b244d13ac5223ec343077fe7b Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <serso1988@gmail.com>
Date: Thu, 27 Oct 2011 10:50:18 +0400
Subject: [PATCH] SYNTAX ERROR is not so often now

---
 res/values/strings.xml                        |  2 +-
 .../android/calculator/CalculatorModel.java   | 21 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8b4bd26f..cd7480c6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="c_app_name">Calculator++</string>
 	<string name="c_app_icon_name">Calc++</string>
     <string name="c_app_settings">Settings</string>
-    <string name="c_syntax_error">Syntax error</string>
+    <string name="c_syntax_error">Error</string>
     <string name="c_result_copied">Result copied to clipboard!</string>
 	<string name="c_settings">Settings</string>
 	<string name="c_help">Help</string>
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorModel.java b/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
index 8c5cc009..d9f9b5a6 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
@@ -153,11 +153,14 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
 					//lock all operations with history
 					if (pendingOperation.getObject() == this) {
 						// actually nothing shall be logged while text operations are done
-						evaluate(expression, operation);
+						evaluate(expression, operation, this);
 
 						historyState.setDisplayState(getCurrentHistoryState().getDisplayState());
 
-						pendingOperation.setObject(null);
+						if (pendingOperation.getObject() == this) {
+							// todo serso: of course there is small probability that someone will set pendingOperation after if statement but before .setObject(null)
+							pendingOperation.setObject(null);
+						}
 					}
 				}
 			}
@@ -182,13 +185,21 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
    		evaluate(false, this.editor.getText().toString(), JsclOperation.simplify);
 	}
 
-	private void evaluate(@Nullable final String expression, @NotNull JsclOperation operation) {
+	private void evaluate(@Nullable final String expression,
+						  @NotNull JsclOperation operation,
+						  @NotNull Runnable currentRunner) {
+
 		if (!StringUtils.isEmpty(expression)) {
 			try {
 				Log.d(CalculatorModel.class.getName(), "Trying to evaluate '" + operation + "': " + expression /*+ StringUtils.fromStackTrace(Thread.currentThread().getStackTrace())*/);
 				final CalculatorEngine.Result result = calculatorEngine.evaluate(operation, expression);
-				display.setText(result.getResult());
-				display.setJsclOperation(result.getUserOperation());
+				if (currentRunner == pendingOperation.getObject()
+						&& expression.equals(this.editor.getText().toString())) {
+					display.setText(result.getResult());
+					display.setJsclOperation(result.getUserOperation());
+				} else {
+					display.setText("");
+				}
 			} catch (EvalError e) {
 				handleEvaluationException(expression, display, operation, e);
 			} catch (ParseException e) {