3.6.2 online time fix

MayGo · Jan 22, 2020 · 92f5d20 · 92f5d20
1 parent 96c2604
commit 92f5d20
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/client/src/components/TrayLayout/TrayMenu.tsx b/client/src/components/TrayLayout/TrayMenu.tsx
@@ -20,9 +20,9 @@ export const TrayMenu = () => {
     };
 
     useEffect(() => {
-        const systemIsOnline = date => {
-            Logger.debug('system-is-online', date);
-            setOnlineSince(date ? date : getNow());
+        const systemIsOnline = () => {
+            Logger.debug('system-is-online');
+            setOnlineSince(getNow());
         };
         const systemIsNotOnline = () => {
             Logger.debug('system-is-not-online');

diff --git a/electron/app/API.ts b/electron/app/API.ts
@@ -5,6 +5,7 @@ import { settingsService } from './services/settings-service';
 import { appSettingService } from './services/app-setting-service';
 import { trackItemService } from './services/track-item-service';
 import { stateManager } from './state-manager';
+import { State } from './enums/state';
 
 const settingsActions = {
     fetchAnalyserSettingsJsonString: async (req, res) => {
@@ -73,7 +74,7 @@ const trackItemActions = {
     getOnlineStartTime: async (req, res) => {
         const statusItem = stateManager.getCurrentStatusTrackItem();
 
-        res.send(statusItem ? statusItem.beginDate : null);
+        res.send(statusItem && statusItem.app === State.Online ? statusItem.beginDate : null);
     },
 };