From 403e78e13432f8d1663f356dd2dcb48089cfcebe Mon Sep 17 00:00:00 2001
From: Jared Goodwin <translucency@outlook.com>
Date: Thu, 12 Dec 2019 14:04:43 -0800
Subject: [PATCH] Fix Linux remote control bug.

---
 .gitignore                              |  2 ++
 ScreenCast.Core/Capture/ScreenCaster.cs | 15 +++++++++------
 Server/Services/BrowserSocketHub.cs     |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d231a60..f78e1470 100644
--- a/.gitignore
+++ b/.gitignore
@@ -272,3 +272,5 @@ __pycache__/
 /Server/CurrentVersion.txt
 /Server/wwwroot/scripts/**/*.js
 /Server/wwwroot/scripts/**/*.map
+/Server/Server.db-shm
+/Server/Server.db-wal
diff --git a/ScreenCast.Core/Capture/ScreenCaster.cs b/ScreenCast.Core/Capture/ScreenCaster.cs
index 5f52961e..994dbf87 100644
--- a/ScreenCast.Core/Capture/ScreenCaster.cs
+++ b/ScreenCast.Core/Capture/ScreenCaster.cs
@@ -68,13 +68,16 @@ namespace Remotely.ScreenCast.Core.Capture
             {
                 try
                 {
-                    var currentDesktopName = Win32Interop.GetCurrentDesktop();
-                    if (desktopName.ToLower() != currentDesktopName.ToLower())
+                    if (OSUtils.IsWindows)
                     {
-                        desktopName = currentDesktopName;
-                        Logger.Write($"Switching to desktop {desktopName} in ScreenCaster.");
-                        Win32Interop.SwitchToInputDesktop();
-                        continue;
+                        var currentDesktopName = Win32Interop.GetCurrentDesktop();
+                        if (desktopName.ToLower() != currentDesktopName.ToLower())
+                        {
+                            desktopName = currentDesktopName;
+                            Logger.Write($"Switching to desktop {desktopName} in ScreenCaster.");
+                            Win32Interop.SwitchToInputDesktop();
+                            continue;
+                        }
                     }
 
                     while (viewer.PendingFrames > 10)
diff --git a/Server/Services/BrowserSocketHub.cs b/Server/Services/BrowserSocketHub.cs
index b7dfffd2..6c7a6a02 100644
--- a/Server/Services/BrowserSocketHub.cs
+++ b/Server/Services/BrowserSocketHub.cs
@@ -180,7 +180,7 @@ namespace Remotely.Server.Services
         private IEnumerable<KeyValuePair<string, Device>> GetActiveClientConnections(string[] deviceIDs)
         {
             return DeviceSocketHub.ServiceConnections.Where(x =>
-                x.Value.OrganizationID == RemotelyUser.Organization.ID &&
+                x.Value.OrganizationID == RemotelyUser.OrganizationID &&
                 deviceIDs.Contains(x.Value.ID)
             );
         }