applied bundle manager patch by Matthew

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@379 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog
index 8557cd20f55109ea34356dc047a5ad66a29e00e2..d3ac7212b873ca0a0f40b9feb88dbb7a99e1836d 100644 (file)
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-17  Matthew Joyce  <mjoyce@aboveit.nl>
+
+       * NGBundleManager.m: check whether bundle is nil prior running a type
+         check (v4.5.130)
+
 2004-11-13  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGBundleManager.m: some code cleanups (v4.5.129)

diff --git a/sope-core/NGExtensions/NGBundleManager.m b/sope-core/NGExtensions/NGBundleManager.m
index f4774237c944b6d810ba823a260460a5398f44ef..001fc60dbcf4ac586272307cc0fce4b8b8054a8b 100644 (file)
--- a/sope-core/NGExtensions/NGBundleManager.m
+++ b/sope-core/NGExtensions/NGBundleManager.m
@@ -595,12 +595,14 @@ static NSString *NGEnvVarPathSeparator = @":";
   bn     = [_name stringByAppendingPathExtension:_type];
   bundle = NSMapGet(self->nameToBundle, bn);
   
-  if (bundle == nil)
-    bundle = [self bundleWithPath:[self pathForBundleWithName:_name type:_type]];
-
-  if (![[bundle bundleType] isEqualToString:_type])
+  if (bundle == nil) {
+    bundle = [self bundleWithPath:
+                    [self pathForBundleWithName:_name type:_type]];
+  }
+  
+  if (bundle != nil && ![[bundle bundleType] isEqualToString:_type])
     bundle = nil;
-
+  
   return bundle;
 }
 - (NSBundle *)bundleWithName:(NSString *)_name {

diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version
index 9f7ca49b8c6ce0cb4e96526de2cb437eac80dcbe..d22cd07611d4c45eaca8af948f2ca11b502ebf1c 100644 (file)
--- a/sope-core/NGExtensions/Version
+++ b/sope-core/NGExtensions/Version
@@ -1,6 +1,6 @@
 # version
 
-SUBMINOR_VERSION:=129
+SUBMINOR_VERSION:=130
 
 # v4.3.115 requires libFoundation v1.0.59
 # v4.2.72  requires libEOControl  v4.2.39