Revision: 18399
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18399&view=rev
Author: hofman
Date: 2012-01-13 12:52:53 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
combine check for error
Modified Paths:
--------------
trunk/bibdesk/BDSKFiler.m
Modified: trunk/bibdesk/BDSKFiler.m
===================================================================
--- trunk/bibdesk/BDSKFiler.m 2012-01-13 07:35:09 UTC (rev 18398)
+++ trunk/bibdesk/BDSKFiler.m 2012-01-13 12:52:53 UTC (rev 18399)
@@ -250,14 +250,9 @@
// so we resolve aliases in the path to the containing folder
resolvedNewPath = [[self resolveAliasesInPath:[newPath
stringByDeletingLastPathComponent]]
stringByAppendingPathComponent:[newPath
lastPathComponent]];
- if (resolvedNewPath == nil) {
- status = NSLocalizedString(@"Unable to resolve aliases in path.",
@"AutoFile error message");
- statusFlag = BDSKCannotResolveAliasErrorMask;
- }
-
resolvedPath = [[self resolveAliasesInPath:[path
stringByDeletingLastPathComponent]]
stringByAppendingPathComponent:[path lastPathComponent]];
- if (resolvedPath == nil) {
+ if (resolvedNewPath == nil || resolvedPath == nil) {
status = NSLocalizedString(@"Unable to resolve aliases in path.",
@"AutoFile error message");
statusFlag = BDSKCannotResolveAliasErrorMask;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
