Add native modules to the loaded modules list.

Otherwise we'd reload/reinit libdoscalls.so (etc) for every module!
icculus · Oct 5, 2016 · 95d666c · 95d666c
1 parent fae99dc
commit 95d666c
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/lx_loader.c b/lx_loader.c
@@ -1085,6 +1085,16 @@ static LxModule *loadLxModuleByModuleNameInternal(const char *modname, const int
             *ptr = (((*ptr >= 'A') && (*ptr <= 'Z')) ? (*ptr - ('A' - 'a')) : *ptr);
         } // for
         retval = loadNativeModule(fname, modname);
+
+        if (retval != NULL) {
+            // module is ready to use, put it in the loaded list.
+            // !!! FIXME: mutex this
+            if (GLoaderState->loaded_modules) {
+                retval->next = GLoaderState->loaded_modules;
+                GLoaderState->loaded_modules->prev = retval;
+            } // if
+            GLoaderState->loaded_modules = retval;
+        } // if
     } // if
     return retval;
 } // loadLxModuleByModuleNameInternal