Changeset 877

Timestamp:

Jun 30, 2011, 6:46:41 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed QLibrary::load() error message when the DLL to load is not found. Closes #206 [patch by rudi].

File:

• trunk/src/corelib/plugin/qlibrary_os2.cpp (modified) (1 diff)

trunk/src/corelib/plugin/qlibrary_os2.cpp

@@ -103 +103 @@
     char errModule[CCHMAXPATH] = { '\0' };
     rc = DosLoadModule(errModule, sizeof(errModule), attempt, &pHnd);
-    if (rc == ERROR_FILE_NOT_FOUND) {
+    if (rc == ERROR_FILE_NOT_FOUND && qstricmp(attempt, errModule) == 0) {
+        // only retry with .DLL appended if the failed module is the tried one
         attempt += ".DLL";
         rc = DosLoadModule(errModule, sizeof(errModule), attempt, &pHnd);