From c1a9678abb35eae1e430b3c79277b9247eb172d0 Mon Sep 17 00:00:00 2001
From: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
Date: Fri, 2 Jun 2023 12:08:06 +0200
Subject: [PATCH] fixing merge again

---
 src/fsfw/osal/linux/Clock.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fsfw/osal/linux/Clock.cpp b/src/fsfw/osal/linux/Clock.cpp
index 28be12477..afb0f4e4d 100644
--- a/src/fsfw/osal/linux/Clock.cpp
+++ b/src/fsfw/osal/linux/Clock.cpp
@@ -47,8 +47,8 @@ timeval Clock::getUptime() {
     return uptime;
   }
   if (ifile >> uptimeSeconds) {
-    uptime->tv_sec = uptimeSeconds;
-    uptime->tv_usec = uptimeSeconds * (double)1e6 - (uptime->tv_sec * 1e6);
+    uptime.tv_sec = uptimeSeconds;
+    uptime.tv_usec = (uptimeSeconds - uptime.tv_sec) * (double)1e6;
   }
   return uptime;
 }