X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin4_src%2FServer%2FCClient.cpp;h=6c9fe685a678202d58615c3b8e8ee3271fc19ef9;hb=145dd00e5c5a36f844be327e16a00b2983245423;hp=f61ca31a730b0ee043469857ca7efabbe30c0300;hpb=8ae0b1147e613573a45fcd8e6f2f6af2aeff54ac;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin4_src/Server/CClient.cpp b/Usermode/Applications/axwin4_src/Server/CClient.cpp
index f61ca31a..6c9fe685 100644
--- a/Usermode/Applications/axwin4_src/Server/CClient.cpp
+++ b/Usermode/Applications/axwin4_src/Server/CClient.cpp
@@ -24,14 +24,17 @@ 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)
 {
+	_SysDebug("SetWindow(ID=%i,window=%p)", ID, window);
 	if( m_windows[ID] ) {
 		delete m_windows[ID];
 	}