From 4571f4cc6e157ac1d995067a147abe15024cb9d7 Mon Sep 17 00:00:00 2001
From: walker0643 <>
Date: Fri, 23 Feb 2018 14:02:38 -0500
Subject: [PATCH] remove annoying LOG statement; add a small bit of debugging
 info

---
 clean_build.bat                               | 3 +++
 src/lib/arch/win32/ArchMultithreadWindows.cpp | 1 +
 src/lib/platform/MSWindowsDesks.cpp           | 3 ++-
 src/lib/server/Server.cpp                     | 1 -
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/clean_build.bat b/clean_build.bat
index 4363182b..14268cd5 100644
--- a/clean_build.bat
+++ b/clean_build.bat
@@ -18,6 +18,9 @@ set BONJOUR_SDK_HOME=%B_BONJOUR%
 REM full path to Qt stuff we need
 set B_QT_FULLPATH=%B_QT_ROOT%\%B_QT_VER%\%B_QT_MSVC%
 
+echo Bonjour: %BONJOUR_SDK_HOME%
+echo Qt: %B_QT_FULLPATH%
+
 rmdir /q /s build
 mkdir build
 if ERRORLEVEL 1 goto failed
diff --git a/src/lib/arch/win32/ArchMultithreadWindows.cpp b/src/lib/arch/win32/ArchMultithreadWindows.cpp
index 3124f4d8..d3fd059a 100644
--- a/src/lib/arch/win32/ArchMultithreadWindows.cpp
+++ b/src/lib/arch/win32/ArchMultithreadWindows.cpp
@@ -232,6 +232,7 @@ ArchMultithreadWindows::waitCondVar(ArchCond cond,
     unlockMutex(mutex);
 
     // wait for a signal or broadcast
+    // TODO: this doesn't always signal when kill signals are sent
     DWORD result = WaitForMultipleObjects(3, handles, FALSE, winTimeout);
 
     // cancel takes priority
diff --git a/src/lib/platform/MSWindowsDesks.cpp b/src/lib/platform/MSWindowsDesks.cpp
index c5b427ac..dead5eeb 100644
--- a/src/lib/platform/MSWindowsDesks.cpp
+++ b/src/lib/platform/MSWindowsDesks.cpp
@@ -126,7 +126,7 @@ MSWindowsDesks::MSWindowsDesks(
     m_events(events),
     m_stopOnDeskSwitch(stopOnDeskSwitch)
 {
-    LOG((CLOG_DEBUG "Immune Keys Path: %s", ImmuneKeysPath));
+    LOG((CLOG_DEBUG "Immune Keys Path: %s", ImmuneKeysPath.c_str()));
 
     if (hookLibrary != NULL)
         queryHookLibrary(hookLibrary);
@@ -717,6 +717,7 @@ MSWindowsDesks::deskThread(void* vdesk)
                 // populate immune keys list in the DLL's shared memory
                 // before the hooks are activated
                 auto list = immune_keys_list();
+                LOG((CLOG_DEBUG "Found %u immune keys", list.size()));
                 m_setImmuneKeys(list.data(), list.size());
                 switch (m_install()) {
                 case kHOOK_FAILED:
diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp
index cbc4e1c1..32153a6c 100644
--- a/src/lib/server/Server.cpp
+++ b/src/lib/server/Server.cpp
@@ -422,7 +422,6 @@ Server::isLockedToScreen() const
 {
 	// locked if we say we're locked
 	if (isLockedToScreenServer()) {
-		LOG((CLOG_NOTE "Cursor is locked to screen, check Scroll Lock key"));
 		return true;
 	}