From 444b899a9f0302fd7a7aecf415ae131bc3914693 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Tue, 8 Jan 2019 19:43:49 -0800
Subject: [PATCH] Java: Fix Timer.get() handling of accumulated time (#1531)

Fixes #1530.
---
 wpilibj/src/main/java/edu/wpi/first/wpilibj/Timer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Timer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Timer.java
index 7f830f45db..a4c553e5b5 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Timer.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Timer.java
@@ -70,7 +70,7 @@ public class Timer {
    */
   public synchronized double get() {
     if (m_running) {
-      return ((getMsClock() - m_startTime) + m_accumulatedTime) / 1000.0;
+      return m_accumulatedTime + (getMsClock() - m_startTime) / 1000.0;
     } else {
       return m_accumulatedTime;
     }