Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit d07d3180d23139ff4539ab5678e443d3134fee8c 2 parents cfbcdde + 3514d6c
Michael Fey authored
Showing with 3 additions and 2 deletions.
  1. +3 −2 DeviceCode/ZSyncTouchHandler.m
5 DeviceCode/ZSyncTouchHandler.m
View
@@ -288,8 +288,9 @@ - (void)services:(NSTimer*)timer
NSString *serverName = [service name];
NSArray *components = [serverName componentsSeparatedByString:zsServerNameSeperator];
ZAssert([components count] == 2,@"Wrong number of components: %i\n%@", [components count], serverName);
- NSString *serverUUID = [components objectAtIndex:1];
- if (![serverUUID isEqualToString:serverUUID]) continue;
+ NSString *incomingServerUUID = [components objectAtIndex:1];
+ if (!incomingServerUUID) continue;
+ if (![incomingServerUUID isEqualToString:serverUUID]) continue;
DLog(@"our server found");
//Found our server, start the sync
Please sign in to comment.
Something went wrong with that request. Please try again.