diff options
| author | Andrew Niefer | 2007-07-09 21:01:47 +0000 |
|---|---|---|
| committer | Andrew Niefer | 2007-07-09 21:01:47 +0000 |
| commit | 9005588ce0b30ade01fccc83e4749b89d14cc659 (patch) | |
| tree | 84ddfc29967574deda5dabf08d25056aa8b0dec0 | |
| parent | fca2ca847e3f07704f97c363238c7bff49673195 (diff) | |
| download | rt.equinox.framework-9005588ce0b30ade01fccc83e4749b89d14cc659.tar.gz rt.equinox.framework-9005588ce0b30ade01fccc83e4749b89d14cc659.tar.xz rt.equinox.framework-9005588ce0b30ade01fccc83e4749b89d14cc659.zip | |
bug 194261
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c | 9 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c b/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c index bd5327eae..0329f4fcd 100644 --- a/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c +++ b/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c @@ -266,6 +266,15 @@ static _TCHAR* findLib( _TCHAR* command ) { return path; } } + + /* if command is eclipse/jre, don't look in registry */ + location = malloc( (_tcslen( getProgramDir() ) + _tcslen( shippedVMDir ) + 1) * sizeof(_TCHAR) ); + _stprintf( location, _T_ECLIPSE("%s%s"), getProgramDir(), shippedVMDir ); + if( _tcsncmp(command, location, _tcslen(location)) == 0) { + free(location); + return NULL; + } + free(location); } /* Not found yet, try the registry, we will use the first vm >= 1.4 */ diff --git a/bundles/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp b/bundles/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp index 390cb14a3..a75b05177 100644 --- a/bundles/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp +++ b/bundles/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp @@ -333,6 +333,15 @@ static _TCHAR* findLib( _TCHAR* command ) { return path; } } + + /* if command is eclipse/jre, don't look in registry */ + location = malloc( (_tcslen( getProgramDir() ) + _tcslen( shippedVMDir ) + 1) * sizeof(_TCHAR) ); + _stprintf( location, _T_ECLIPSE("%s%s"), getProgramDir(), shippedVMDir ); + if( _tcsncmp(command, location, _tcslen(location)) == 0) { + free(location); + return NULL; + } + free(location); } /* Not found yet, try the registry, we will use the first vm >= 1.4 */ |