Improved handling of screen saver handling when windows 2k is

the client and the screen saver is password protected.  It used
to immediately turn off the screen saver (unintentionally) in
that case.

lib/platform/CMSWindowsScreen.cpp

@@ -473,9 +473,16 @@ CMSWindowsScreen::onPreDispatch(const CEvent* event)
 				if (isCurrentDesktop(desk)) {
 					CloseDesktop(desk);
 				}
-				else {
+				else if (!m_screensaver->isActive()) {
+					// don't switch desktops when the screensaver is
+					// active.  we'd most likely switch to the
+					// screensaver desktop which would have the side
+					// effect of forcing the screensaver to stop.
 					switchDesktop(desk);
 				}
+				else {
+					CloseDesktop(desk);
+				}
 			}
 		}
 		return true;