diff --git a/checkin_notes b/checkin_notes index 4c6211aeec..ea379216bc 100644 --- a/checkin_notes +++ b/checkin_notes @@ -1651,3 +1651,9 @@ David 14 Mar 2011 html/ops/ nvidia.php + +Charlie 14 Mar 2011 + - SCR: Fix compile breaks. + + clientscr/ + mac_saver_module.cpp diff --git a/clientscr/mac_saver_module.cpp b/clientscr/mac_saver_module.cpp index f30ebab708..d978345e13 100644 --- a/clientscr/mac_saver_module.cpp +++ b/clientscr/mac_saver_module.cpp @@ -297,7 +297,8 @@ int CScreensaver::Create() { if (saverState == SaverState_LaunchingCoreClient) { SetError(FALSE, 0); - m_QuitDataManagementProc = false; + m_bQuitDataManagementProc = false; + m_bDataManagementProcStopped = false; if (rpc == NULL) { rpc = new RPC_CLIENT; } @@ -564,7 +565,7 @@ void CScreensaver::ShutdownSaver() { m_CoreClientPID = 0; // gQuitCounter = 0; m_wasAlreadyRunning = false; - m_QuitDataManagementProc = false; + m_bQuitDataManagementProc = false; saverState = SaverState_Idle; } @@ -605,7 +606,7 @@ void CScreensaver::HandleRPCError() { // If Core Client is hung, it might cause RPCs to hang, preventing us from // shutting down the Data Management Thread, so don't reinitialize the RPC // client if we have told the Data Management Thread to exit. - if (m_QuitDataManagementProc) { + if (m_bQuitDataManagementProc) { return; }