From a5699c8887565696c8a77a7254abbc860e7001f8 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Fri, 4 Jan 2008 02:37:00 -0800 Subject: [PATCH] Fix some variable hiding that was caused by our refactoring. Unfortunately, our code still hangs when we try to connect. --- Source/DebuggerConnection.h | 2 +- Source/DebuggerConnection.m | 4 ++-- Source/DebuggerWindowController.m | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/DebuggerConnection.h b/Source/DebuggerConnection.h index 75da51c..4eb1a51 100644 --- a/Source/DebuggerConnection.h +++ b/Source/DebuggerConnection.h @@ -32,7 +32,7 @@ } // initializer -- (id)initWithPort:(int)aPort session:(NSString *)session; +- (id)initWithPort:(int)aPort session:(NSString *)aSession; - (void)windowDidClose; diff --git a/Source/DebuggerConnection.m b/Source/DebuggerConnection.m index 943885f..8c19d38 100644 --- a/Source/DebuggerConnection.m +++ b/Source/DebuggerConnection.m @@ -29,12 +29,12 @@ * Creates a new DebuggerConnection and initializes the socket from the given connection * paramters. */ -- (id)initWithPort:(int)aPort session:(NSString *)session +- (id)initWithPort:(int)aPort session:(NSString *)aSession { if (self = [super init]) { port = aPort; - session = [session retain]; + session = [aSession retain]; connected = NO; windowController = [[DebuggerWindowController alloc] initWithConnection:self]; diff --git a/Source/DebuggerWindowController.m b/Source/DebuggerWindowController.m index d2a825b..efab953 100644 --- a/Source/DebuggerWindowController.m +++ b/Source/DebuggerWindowController.m @@ -89,7 +89,7 @@ if ([connection isConnected]) { - if ([status isEqualToString:@"Starting"]) + if ([aStatus isEqualToString:@"Starting"]) { [stepInButton setEnabled:YES]; [runButton setEnabled:YES]; -- 2.22.5