[chronojump] Fix to last commit
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fix to last commit
- Date: Thu, 11 Aug 2016 08:25:58 +0000 (UTC)
commit 6cf5cf98f569e54c491758063827dc8ab4b199e2
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Aug 11 10:25:33 2016 +0200
Fix to last commit
src/gui/encoder.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index efb98eb..0ca6278 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -4155,12 +4155,14 @@ public partial class ChronoJumpWindow
string myColor = repetitiveConditionsWin.AssignColorAutomatic(d);
bool discarded = false;
- if( eccon == "c" && discardFirstThree && count < 3)
- discarded = true;
- else if( eccon != "c" && discardFirstThree && count < 6)
- discarded = true;
- else if ( (eccon == "ec" || eccon == "ecS") &&
encoderConfigurationCurrent.has_inertia && count == 0)
- discarded = true; //on inertial devices "ec" or "ecS", the first ecc
cannot have feedback
+ if(encoderConfigurationCurrent.has_inertia) {
+ if(eccon == "c" && discardFirstThree && count < 3)
+ discarded = true;
+ else if(eccon != "c" && discardFirstThree && count < 6)
+ discarded = true;
+ else if ((eccon == "ec" || eccon == "ecS") && count == 0)
+ discarded = true; //on inertial devices "ec" or "ecS", the
first ecc cannot have feedback
+ }
if( ! discarded && ( myColor == UtilGtk.ColorGood || (mainVariableHigher != -1 && d
= mainVariableHigher) ) )
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]