- Look for TIP filename only when TSF is active in a thread

diff --git a/nvdaHelper/remote/ime.cpp b/nvdaHelper/remote/ime.cpp
index 325da1d..479d102 100644 (file)
--- a/nvdaHelper/remote/ime.cpp
+++ b/nvdaHelper/remote/ime.cpp
@@ -179,7 +179,16 @@ void handleReadingStringUpdate(HWND hwnd) {
        DWORD version=0;\r
        HMODULE IMEFile=NULL;\r
        GetReadingString_funcType GetReadingString=NULL;\r
-       if(ImmGetIMEFileNameW(kbd_layout, filename, MAX_PATH)>0) {\r
+       if (isTSFThread(true)) {\r
+               // Look up filename of active TIP\r
+               if(getTIPFilename(curTSFClsID, filename, MAX_PATH)) {\r
+                       IMEFile=LoadLibrary(filename);\r
+                       if(IMEFile) {\r
+                               GetReadingString=(GetReadingString_funcType)GetProcAddress(IMEFile, "GetReadingString");\r
+                       }\r
+               }\r
+       }\r
+       else if(ImmGetIMEFileNameW(kbd_layout, filename, MAX_PATH)>0) {\r
                IMEFile=LoadLibrary(filename);\r
                if(IMEFile) {\r
                        GetReadingString=(GetReadingString_funcType)GetProcAddress(IMEFile, "GetReadingString");\r
@@ -188,13 +197,6 @@ void handleReadingStringUpdate(HWND hwnd) {
                        version=getIMEVersion(kbd_layout,filename);\r
                }\r
        }\r
-       else if(getTIPFilename(curTSFClsID, filename, MAX_PATH)) {\r
-               // Look up filename of active TIP\r
-               IMEFile=LoadLibrary(filename);\r
-               if(IMEFile) {\r
-                       GetReadingString=(GetReadingString_funcType)GetProcAddress(IMEFile, "GetReadingString");\r
-               }\r
-       }\r
        if(GetReadingString) {\r
                // Use GetReadingString() API if available\r
                UINT   len = 0;\r