Merge pull request #231 from Aga-C/fix-sign-change

Fixed changing operator after dividing by zero (#202)
2021-12-29 21:52:47 +01:00 · 2021-12-29 21:52:47 +01:00 · 5293466274
commit 5293466274
parent 3352fab92e f92d80099b
1 changed files with 8 additions and 2 deletions
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
@ -118,8 +118,14 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
            }
        }

-        lastKey = operation
-        lastOperation = operation
+        if (getSecondValue() == 0.0 && inputDisplayedFormula.contains("÷")) {
+            lastKey = DIVIDE
+            lastOperation = DIVIDE
+        } else {
+            lastKey = operation
+            lastOperation = operation
+        }
+
        showNewResult(inputDisplayedFormula)
    }