--- runideLast.cpp	2003-03-04 07:05:58.000000000 -0100
+++ runide.cpp	2003-03-04 07:16:59.000000000 -0100
@@ -30,6 +30,7 @@
 #define DEFAULT_ARGS "" // use ide.cfg to define default arguments
 
 #define JDK_KEY "Software\\JavaSoft\\Java Development Kit"
+#define JRE_KEY "Software\\JavaSoft\\Java Runtime Environment"
 #define DEFAULT_IDE_KEY "Software\\netbeans.org\\NetBeans IDE\\Dev"
 #define DEFAULT_USERDIR_NAME ".netbeans\\Dev"
 
@@ -112,7 +113,8 @@
         *pc = '\0';
     strcpy(idehome, buf);
 
-    findJdkFromRegistry(JDK_KEY, jdkhome);
+    if (findJdkFromRegistry(JDK_KEY, jdkhome) == 1)
+		findJdkFromRegistry(JRE_KEY, jdkhome);
     parseCommandLine(DEFAULT_ARGS);
     parseIdeCfg(idehome);
     parseArgs(argc - 1, argv + 1); // skip progname
@@ -335,6 +337,12 @@
                 break;
         }
     }
+
+	if (NULL == hJvm) {
+		//try loading the JRE
+		strcat(strcat(strcpy(jvmpath, jdkhome),"\\bin\\client\\"),"\\jvm.dll");
+		hJvm = LoadLibrary(jvmpath);
+	}
     
     if (NULL == hJvm) {
         if (jvm_name != NULL)
@@ -1383,7 +1391,8 @@
         *pc = '\0';
     strcpy(idehome, buf);
 
-    findJdkFromRegistry(JDK_KEY, jdkhome);
+    if (findJdkFromRegistry(JDK_KEY, jdkhome) == 1)
+		findJdkFromRegistry(JRE_KEY, jdkhome);
     parseCommandLine(DEFAULT_ARGS);
     parseIdeCfg(idehome);
     parseArgs(__argc - 1, __argv + 1); // skip progname