moved display of scsiWindow() to right around the insmod (makes multiple

module installation cleaner)

1 files changed, 12 insertions, 0 deletions

diff --git a/loader/modules.c b/loader/modules.c
index 68d10cc0c..1f9b1d3cd 100644
--- a/loader/modules.c
+++ b/loader/modules.c
@@ -22,6 +22,7 @@
 #include "misc.h"
 #include "modules.h"
 #include "devices.h"
+#include "windows.h"
 
 struct moduleDependency_s {
     char * name;
@@ -300,6 +301,7 @@ static int loadModule(const char * modName, char * path, moduleList modLoaded,
     int ethDevices = -1;
     pid_t child;
     int status;
+    int popWindow = 0;
 
     if (mlModuleInList(modName, modLoaded))
 	return 0;
@@ -308,6 +310,11 @@ static int loadModule(const char * modName, char * path, moduleList modLoaded,
 	if (mi->major == DRIVER_NET && mi->minor == DRIVER_MINOR_ETHERNET) {
 	    ethDevices = ethCount();
 	}
+
+	if (mi->major == DRIVER_SCSI) {
+	    scsiWindow(modName);
+	    popWindow = 1;
+	}
     }
 
     sprintf(fileName, "%s.o", modName);
@@ -375,6 +382,11 @@ static int loadModule(const char * modName, char * path, moduleList modLoaded,
 	modLoaded->mods[modLoaded->numModules++].args = newArgs;
     }
 
+    if (popWindow) {
+	sleep(1);
+	newtPopWindow();
+    }
+
     return rc;
 }