Index: TSF.cpp
===================================================================
--- TSF.cpp	(revision 160861)
+++ TSF.cpp	(revision 160862)
@@ -1206,7 +1206,9 @@
 void TSF::ActivateWindow(void* hWnd)
 {
     NS_LOG_TRACE("ActivateWindow(hWnd=%p)", hWnd);
-    NS_ASSERT(gCurrentWindow == 0 || gCurrentWindow == hWnd);
+    if (!(gCurrentWindow == 0 || gCurrentWindow == hWnd)) { 
+        NS_LOG_WARNING("TSF::ActivateWindow: failed assertion (gCurrentWindow == 0 || gCurrentWindow == hWnd), gCurrentWindow = 0x%x, hWnd = 0x%x ", gCurrentWindow, hWnd); 
+    }
     gCurrentWindow = (HWND)hWnd;
 
     // NOTE: When hWnd is activated, the associated Noesis View automatically restores keyboard
@@ -1220,7 +1222,9 @@
 void TSF::DeactivateWindow(void* hWnd)
 {
     NS_LOG_TRACE("DeactivateWindow(hWnd=%p)", hWnd);
-    NS_ASSERT(gCurrentWindow == hWnd);
+    if (!(gCurrentWindow == hWnd)) { 
+        NS_LOG_WARNING("TSF::DeactivateWindow: failed assertion (gCurrentWindow == hWnd), gCurrentWindow = 0x%x, hWnd = 0x%x ", gCurrentWindow, hWnd); 
+    }
     gCurrentWindow = 0;
 }