From e2566a2247366ac76b5321fbe12ed72cf242db28 Mon Sep 17 00:00:00 2001 From: fedor Date: Mon, 8 Sep 2003 02:47:50 +0000 Subject: [PATCH] loadingBundles fix git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17640 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSBundle.m | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18ebb7112..f84933056 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-09-07 Adam Fedor + * Source/NSBundle.m (+_addFrameworkFromClass:): Check + _loadingBundle != bundle when removing classes. + +2003-09-07 S.J.Chun + * Source/Unicode.m: Added Korean encoding * Headers/Foundation/NSString.h: Added Korean encoding * Source/Additions/GSCompatibility.h: Idem. diff --git a/Source/NSBundle.m b/Source/NSBundle.m index f4928d216..d49419ae5 100644 --- a/Source/NSBundle.m +++ b/Source/NSBundle.m @@ -471,9 +471,11 @@ _bundle_name_first_match(NSString* directory, NSString* name) * linked into the bundle (then, the dynamic linker * automatically drags in the framework when the bundle is * loaded). But then, the classes in the framework should be - * removed from the list of classes in the bundle. + * removed from the list of classes in the bundle. Check that + * _loadingBundle != bundle which happens on Windows machines when + * loading in Frameworks. */ - if (_loadingBundle != nil) + if (_loadingBundle != nil && _loadingBundle != bundle) { [(NSMutableArray *)[_loadingBundle _bundleClasses] removeObjectsInArray: [bundle _bundleClasses]];