X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FApplications%2Faxwin4_src%2FServer%2FCClient.cpp;h=6c9fe685a678202d58615c3b8e8ee3271fc19ef9;hb=5b487e31cf5145372e9777e9f82a8cd661d4f1b4;hp=9fe806e37a941f97ae9690865f8a8d293d089bfa;hpb=0868c6e02b76236ea70a6daa232b3c373f61e131;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin4_src/Server/CClient.cpp b/Usermode/Applications/axwin4_src/Server/CClient.cpp
index 9fe806e3..6c9fe685 100644
--- a/Usermode/Applications/axwin4_src/Server/CClient.cpp
+++ b/Usermode/Applications/axwin4_src/Server/CClient.cpp
@@ -24,10 +24,12 @@ CClient::~CClient()
 
 CWindow* CClient::GetWindow(int ID)
 {
-	if( ID == 0 )
-		return 0;
-	
-	return m_windows[ID];
+	try {
+		return m_windows.at(ID);
+	}
+	catch(const std::exception& e) {
+		return NULL;
+	}
 }
 
 void CClient::SetWindow(int ID, CWindow* window)
@@ -36,9 +38,7 @@ void CClient::SetWindow(int ID, CWindow* window)
 	if( m_windows[ID] ) {
 		delete m_windows[ID];
 	}
-	_SysDebug("SetWindow - Set", ID, window);
 	m_windows[ID] = window;
-	_SysDebug("SetWindow - END");
 }
 
 void CClient::HandleMessage(CDeserialiser& message)