gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-18 03:30:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

loadingBundles fix

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17640 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2003-09-08 02:47:50 +00:00
parent 36a8e49a1f
commit e2566a2247
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,10 @@
2003-09-07 Adam Fedor <fedor@gnu.org> 2003-09-07 Adam Fedor <fedor@gnu.org>
* Source/NSBundle.m (+_addFrameworkFromClass:): Check
_loadingBundle != bundle when removing classes.
2003-09-07 S.J.Chun <chunsj@embian.com>
* Source/Unicode.m: Added Korean encoding * Source/Unicode.m: Added Korean encoding
* Headers/Foundation/NSString.h: Added Korean encoding * Headers/Foundation/NSString.h: Added Korean encoding
* Source/Additions/GSCompatibility.h: Idem. * Source/Additions/GSCompatibility.h: Idem.

6
Source/NSBundle.m
View file

@ -471,9 +471,11 @@ _bundle_name_first_match(NSString* directory, NSString* name)
* linked into the bundle (then, the dynamic linker * linked into the bundle (then, the dynamic linker
* automatically drags in the framework when the bundle is * automatically drags in the framework when the bundle is
* loaded). But then, the classes in the framework should be * 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] [(NSMutableArray *)[_loadingBundle _bundleClasses]
removeObjectsInArray: [bundle _bundleClasses]]; removeObjectsInArray: [bundle _bundleClasses]];