From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Wed, 17 Nov 2004 00:15:59 +0000 (+0000)
Subject: applied bundle manager patch by Matthew
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d490a9a5ff20008d422d8681d1da9f553b95caa1;p=sope

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 8557cd20..d3ac7212 100644
--- 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 f4774237..001fc60d 100644
--- 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 9f7ca49b..d22cd076 100644
--- 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