Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit d07d3180d23139ff4539ab5678e443d3134fee8c 2 parents cfbcdde + 3514d6c
Michael Fey authored

Showing 1 changed file with 3 additions and 2 deletions. Show diff stats Hide diff stats

  1. +3 2 DeviceCode/ZSyncTouchHandler.m
5 DeviceCode/ZSyncTouchHandler.m
@@ -288,8 +288,9 @@ - (void)services:(NSTimer*)timer
288 288 NSString *serverName = [service name];
289 289 NSArray *components = [serverName componentsSeparatedByString:zsServerNameSeperator];
290 290 ZAssert([components count] == 2,@"Wrong number of components: %i\n%@", [components count], serverName);
291   - NSString *serverUUID = [components objectAtIndex:1];
292   - if (![serverUUID isEqualToString:serverUUID]) continue;
  291 + NSString *incomingServerUUID = [components objectAtIndex:1];
  292 + if (!incomingServerUUID) continue;
  293 + if (![incomingServerUUID isEqualToString:serverUUID]) continue;
293 294
294 295 DLog(@"our server found");
295 296 //Found our server, start the sync

0 comments on commit d07d318

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