nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-13 21:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not follow symlinks when compressing MacPass.app

Browse Source
This commit is contained in:
michael starke
2017-09-26 09:12:02 +02:00
parent a39d38f457
commit 527255c6d5
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -4,11 +4,11 @@ xcode_scheme: MacPass
language: objective-c
before_install:
- carthage bootstrap --platform Mac
- carthage bootstrap --platform macOS
after_success:
- cd ./build/Build/Products/Release
- zip -9r MacPass-continuous.zip MacPass.app
- zip -9ry MacPass-continuous.zip MacPass.app
- cd -
- mv ./build/Build/Products/Release/MacPass-continuous.zip .

7
MacPass/MPDocument.m
View File

@@ -412,11 +412,10 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
[self saveDocument] is enqued so that dataOfType is called too late to actually save teh database.
hence we need to get the ok from the NSDocument about the save, otherwise the lock fails!
*/
if(self.lockedForFileChange) {
// we have user interaction that cannot be dismissed, instead ignore locking!
return;
// only lock if we do not have user interaction that cannot be dismissed!
if(!self.lockedForFileChange) {
[self saveDocumentWithDelegate:self didSaveSelector:@selector(_lockDatabaseForDocument:didSave:contextInfo:) contextInfo:NULL];
}
[self saveDocumentWithDelegate:self didSaveSelector:@selector(_lockDatabaseForDocument:didSave:contextInfo:) contextInfo:NULL];
}
- (void)_lockDatabaseForDocument:(NSDocument *)document didSave:(BOOL)didSave contextInfo:(void *)contextInfo {