Improve renderer log forwarding

1 files changed, 6 insertions, 1 deletions

diff --git a/gui/src/main/user-interface.ts b/gui/src/main/user-interface.ts
index ae9e9c8592..624347a9d3 100644
--- a/gui/src/main/user-interface.ts
+++ b/gui/src/main/user-interface.ts
@@ -8,9 +8,10 @@ import { IAccountData, ILocation, TunnelState } from '../shared/daemon-rpc-types
 import { messages, relayLocations } from '../shared/gettext';
 import log from '../shared/logging';
 import { Scheduler } from '../shared/scheduler';
-import { SHOULD_DISABLE_DEVTOOLS_OPEN } from './command-line-options';
+import { SHOULD_DISABLE_DEVTOOLS_OPEN, SHOULD_FORWARD_RENDERER_LOG } from './command-line-options';
 import { DaemonRpc } from './daemon-rpc';
 import { changeIpcWebContents, IpcMainEventChannel } from './ipc-event-channel';
+import { WebContentsConsoleInput } from './logging';
 import { isMacOs11OrNewer } from './platform-version';
 import TrayIconController, { TrayIconType } from './tray-icon-controller';
 import WindowController, { WindowControllerDelegate } from './window-controller';
@@ -96,6 +97,10 @@ export default class UserInterface implements WindowControllerDelegate {
         // The devtools doesn't open on Windows if openDevTools is called without a delay here.
         window.once('ready-to-show', () => window.webContents.openDevTools({ mode: 'detach' }));
       }
+
+      if (SHOULD_FORWARD_RENDERER_LOG) {
+        log.addInput(new WebContentsConsoleInput(window.webContents));
+      }
     }
 
     switch (process.platform) {