Merge from branch: check bundle loading and warn

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@39586 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Riccardo Mottola 2016-03-22 23:16:45 +00:00
parent b964564325
commit 34c9eb4279
3 changed files with 12 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2016-03-23 Riccardo Mottola <rm@gnu.org>
* Framework/PCBundleManager.m
* Framework/PCProjectLauncher.m
Merge from branch: check bundle loading and warn.
2016-03-15 18:47-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Modules/Debuggers/ProjectCenter/PTYView.h

View file

@ -129,6 +129,7 @@
reqBundlesInfo = [self infoForBundlesType:extension];
enumerator = [[reqBundlesInfo allKeys] objectEnumerator];
infoTable = nil;
while ((bundlePath = [enumerator nextObject]))
{
infoTable = [reqBundlesInfo objectForKey:bundlePath];
@ -167,6 +168,7 @@
NSString *bundlePath;
NSDictionary *infoTable;
infoTable = nil;
while ((bundlePath = [enumerator nextObject]))
{
infoTable = [reqBundlesInfo objectForKey:bundlePath];
@ -235,6 +237,7 @@
if (!className)
{
NSLog(@"Bundle for class called with empty className");
return nil;
}

View file

@ -41,7 +41,7 @@
#endif
#ifndef IMAGE
#define IMAGE(X) [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForImageResource:(X)]] autorelease]
#define IMAGE(X) [NSImage imageNamed: X]
#endif
enum {
@ -284,6 +284,8 @@ enum {
fileName: [executablePath stringByDeletingLastPathComponent]];
[debugger debugExecutableAtPath: executablePath
withDebugger: gdbPath];
if (!debugger)
NSLog(@"No debugger module found");
// turn debug button off...
// [debugButton setState:NSOffState];