Skip to content
Browse files

Merge branch 'master' of github.com:mzarra/ZSync

  • Loading branch information...
2 parents b3ac66b + 8bb28ec commit 4a74cf66686dbf23bfe5a6bbb717ec7d82ccebe1 Marcus S. Zarra committed
Showing with 5 additions and 3 deletions.
  1. +4 −2 Daemon/Classes/AppDelegate.m
  2. +1 −1 DeviceCode/ZSyncTouchHandler.m
View
6 Daemon/Classes/AppDelegate.m
@@ -34,7 +34,8 @@ - (void)applicationDidFinishLaunching:(NSNotification*)aNotification
{
[[ZSyncHandler shared] setDelegate:self];
[[ZSyncHandler shared] startBroadcasting];
-
+
+#ifdef USEZSMENU
NSMenu *menu = [[NSMenu alloc] initWithTitle:@"ZSync"];
NSMenuItem *aboutMenu = [[NSMenuItem alloc] initWithTitle:@"About" action:@selector(about:) keyEquivalent:@""];
@@ -56,7 +57,8 @@ - (void)applicationDidFinishLaunching:(NSNotification*)aNotification
[statusItem setAction:@selector(statusItemSelected:)];
[menu release], menu = nil;
-
+#endif
+
[[NSApplication sharedApplication] performSelector:@selector(hide:) withObject:self afterDelay:0.1];
}
View
2 DeviceCode/ZSyncTouchHandler.m
@@ -489,7 +489,7 @@ - (void)uploadDataToServer;
storeFileIdentifiers = [[NSMutableArray alloc] init];
- NSAssert([self persistentStoreCoordinator] != nil, @"PSD is nil. Unable to upload");
+ NSAssert([self persistentStoreCoordinator] != nil, @"The persistent store coordinator was nil. Make sure you are calling registerDelegate:withPersistentStoreCoordinator: before trying to sync.");
for (NSPersistentStore *store in [[self persistentStoreCoordinator] persistentStores]) {
NSData *data = [[NSData alloc] initWithContentsOfMappedFile:[[store URL] path]];

0 comments on commit 4a74cf6

Please sign in to comment.
Something went wrong with that request. Please try again.