Skip to content
Browse files

Fixed the UUID migration

  • Loading branch information...
1 parent c020167 commit 4540fe5c8cf342ec18448d8e7ad1761e8b519b38 Michael Fey committed Aug 12, 2010
Showing with 1 addition and 2 deletions.
  1. +1 −1 DeviceCode/ZSyncTouchHandler.m
  2. +0 −1 SharedCode/ZSyncShared.h
View
2 DeviceCode/ZSyncTouchHandler.m
@@ -438,7 +438,7 @@ - (void)netServiceDidResolveAddress:(NSNetService *)bonjourService
if ([incomingServerUUID hasPrefix:registeredServerUUID]) {
DLog(@"Found an instance of an old UUID that we will upgrade");
- [[NSUserDefaults standardUserDefaults] setValue:incomingServerName forKey:zsServerUUID];
+ [[NSUserDefaults standardUserDefaults] setValue:incomingServerUUID forKey:zsServerUUID];
[incomingServerUUID release], incomingServerUUID = nil;
[incomingServerName release], incomingServerName = nil;
} else {
View
1 SharedCode/ZSyncShared.h
@@ -2,7 +2,6 @@
#define DLog(...) NSLog(@"%s(%x) %@", __PRETTY_FUNCTION__, self, [NSString stringWithFormat:__VA_ARGS__])
#define ALog(...) [[NSAssertionHandler currentHandler] handleFailureInFunction:[NSString stringWithCString:__PRETTY_FUNCTION__ encoding:NSUTF8StringEncoding] file:[NSString stringWithCString:__FILE__ encoding:NSUTF8StringEncoding] lineNumber:__LINE__ description:__VA_ARGS__]
#else
-#define DLog(...) NSLog(@"%s(%x) %@", __PRETTY_FUNCTION__, self, [NSString stringWithFormat:__VA_ARGS__])
#ifndef NS_BLOCK_ASSERTIONS
#define NS_BLOCK_ASSERTIONS
#endif

0 comments on commit 4540fe5

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