diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2004-08-21 22:57:07 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2004-08-21 22:57:07 +0000 |
commit | ae7df4d0ac4c88d77a95f6056d105f7c0ccf608a (patch) | |
tree | 4341302e26189c51c897e36b77ef792a5dd4a66d | |
parent | 2f20b3e78426600e0e8008eab6663fc4f0547f57 (diff) | |
download | rockbox-ae7df4d0ac4c88d77a95f6056d105f7c0ccf608a.tar.gz rockbox-ae7df4d0ac4c88d77a95f6056d105f7c0ccf608a.zip |
M+ always copied the power part of the result, even after performing an addition.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5002 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/calculator.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 1630f03877..35ebea6e70 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -1103,10 +1103,12 @@ void basicButtonsProcess(void){ | |||
1103 | formatResult(); | 1103 | formatResult(); |
1104 | if (memTemp > MINIMUM) | 1104 | if (memTemp > MINIMUM) |
1105 | doAdd(&memTemp, &memTempPower, result, power); | 1105 | doAdd(&memTemp, &memTempPower, result, power); |
1106 | else | 1106 | else { |
1107 | /* if result is too small and memTemp = 0, | 1107 | /* if result is too small and memTemp = 0, |
1108 | doAdd will not add */ | 1108 | doAdd will not add */ |
1109 | memTemp = result; memTempPower = power; | 1109 | memTemp = result; |
1110 | memTempPower = power; | ||
1111 | } | ||
1110 | calStatus = cal_normal; | 1112 | calStatus = cal_normal; |
1111 | break; | 1113 | break; |
1112 | 1114 | ||