From b113c4e7cef2d7d178d2893aa677c9c1fdf817fc Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Wed, 22 Apr 2020 18:52:23 -0700 Subject: [PATCH] Revert "Move capturer init." This reverts commit 54a4f645bf64d35cd764816a4c5b6c80d3d11220. --- ScreenCast.Core/Services/ScreenCaster.cs | 1 - ScreenCast.Linux/Services/ScreenCapturerLinux.cs | 1 + ScreenCast.Win/Services/ScreenCapturerWin.cs | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ScreenCast.Core/Services/ScreenCaster.cs b/ScreenCast.Core/Services/ScreenCaster.cs index ed9c2e39..a447ae27 100644 --- a/ScreenCast.Core/Services/ScreenCaster.cs +++ b/ScreenCast.Core/Services/ScreenCaster.cs @@ -39,7 +39,6 @@ namespace Remotely.ScreenCast.Core.Services var fpsQueue = new Queue(); mode = Conductor.Mode; var viewer = ServiceContainer.Instance.GetRequiredService(); - viewer.Capturer.Init(); viewer.Name = screenCastRequest.RequesterName; viewer.ViewerConnectionID = screenCastRequest.ViewerID; viewers = Conductor.Viewers; diff --git a/ScreenCast.Linux/Services/ScreenCapturerLinux.cs b/ScreenCast.Linux/Services/ScreenCapturerLinux.cs index 407ab837..2880c490 100644 --- a/ScreenCast.Linux/Services/ScreenCapturerLinux.cs +++ b/ScreenCast.Linux/Services/ScreenCapturerLinux.cs @@ -16,6 +16,7 @@ namespace Remotely.ScreenCast.Linux.Services public ScreenCapturerLinux() { Display = LibX11.XOpenDisplay(null); + Init(); } public event EventHandler ScreenChanged; diff --git a/ScreenCast.Win/Services/ScreenCapturerWin.cs b/ScreenCast.Win/Services/ScreenCapturerWin.cs index f5a8cfa5..abbcf3ae 100644 --- a/ScreenCast.Win/Services/ScreenCapturerWin.cs +++ b/ScreenCast.Win/Services/ScreenCapturerWin.cs @@ -44,6 +44,7 @@ namespace Remotely.ScreenCast.Win.Services private readonly Dictionary directxScreens = new Dictionary(); public ScreenCapturerWin() { + Init(); SystemEvents.DisplaySettingsChanged += SystemEvents_DisplaySettingsChanged; }