Author: rmottola
Date: Wed Mar 23 00:16:45 2016
New Revision: 39586
URL: http://svn.gna.org/viewcvs/gnustep?rev=39586&view=rev
Log:
Merge from branch: check bundle loading and warn
Modified:
apps/projectcenter/trunk/ChangeLog
apps/projectcenter/trunk/Framework/PCBundleManager.m
apps/projectcenter/trunk/Framework/PCProjectLauncher.m
Modified: apps/projectcenter/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/ChangeLog?rev=39586&r1=39585&r2=39586&view=diff
==============================================================================
--- apps/projectcenter/trunk/ChangeLog (original)
+++ apps/projectcenter/trunk/ChangeLog Wed Mar 23 00:16:45 2016
@@ -1,3 +1,9 @@
+2016-03-23 Riccardo Mottola <[email protected]>
+
+ * Framework/PCBundleManager.m
+ * Framework/PCProjectLauncher.m
+ Merge from branch: check bundle loading and warn.
+
2016-03-15 18:47-EDT Gregory John Casamento <[email protected]>
* Modules/Debuggers/ProjectCenter/PTYView.h
Modified: apps/projectcenter/trunk/Framework/PCBundleManager.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/Framework/PCBundleManager.m?rev=39586&r1=39585&r2=39586&view=diff
==============================================================================
--- apps/projectcenter/trunk/Framework/PCBundleManager.m (original)
+++ apps/projectcenter/trunk/Framework/PCBundleManager.m Wed Mar 23
00:16:45 2016
@@ -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;
}
Modified: apps/projectcenter/trunk/Framework/PCProjectLauncher.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/Framework/PCProjectLauncher.m?rev=39586&r1=39585&r2=39586&view=diff
==============================================================================
--- apps/projectcenter/trunk/Framework/PCProjectLauncher.m (original)
+++ apps/projectcenter/trunk/Framework/PCProjectLauncher.m Wed Mar 23
00:16:45 2016
@@ -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 @@
fileName: [executablePath
stringByDeletingLastPathComponent]];
[debugger debugExecutableAtPath: executablePath
withDebugger: gdbPath];
+ if (!debugger)
+ NSLog(@"No debugger module found");
// turn debug button off...
// [debugButton setState:NSOffState];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
