- Fix a number of small memory leaks

5 files changed, 11 insertions, 15 deletions

diff --git a/Frameworks/PSMTabBar/PSMRolloverButton.m b/Frameworks/PSMTabBar/PSMRolloverButton.m
index 988abbb2..eebbd68e 100644
--- a/Frameworks/PSMTabBar/PSMRolloverButton.m
+++ b/Frameworks/PSMTabBar/PSMRolloverButton.m
@@ -24,6 +24,8 @@
 	[self resetCursorRects];
 	
 	_myTrackingRectTag = -1;
+	_rolloverImage = nil;
+	_usualImage = nil;
 }
 
 - (void)dealloc
@@ -31,6 +33,8 @@
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
 	
 	[self removeTrackingRect];
+	[_rolloverImage release];
+	[_usualImage release];
 	
 	[super dealloc];
 }
diff --git a/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m
index b28fbbf8..b0a96ccd 100644
--- a/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m
+++ b/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m
@@ -655,21 +655,10 @@
 {
     NSRect cellFrame = [cell frame];
 	CGFloat insetLabelWidth = 0;
-	BOOL tabBarIsRightOfSelectedTab = NO;
-	
-	// Determine if the selected tab is right of this tab
-	for (PSMTabBarCell *aCell in [tabBar cells]) {
-		if (aCell == cell) break;
-		if ([aCell state] == NSOnState) {
-			tabBarIsRightOfSelectedTab = YES;
-			break;
-		}
-	}
-    
+
     // close button
     if ([cell hasCloseButton] && ![cell isCloseButtonSuppressed] && [cell isHighlighted]) {
 		
-        NSSize closeButtonSize = NSZeroSize;
         NSRect closeButtonRect = [cell closeButtonRectForFrame:cellFrame];
         NSImage * closeButton = nil;
 
@@ -677,9 +666,7 @@
 		
         if ([cell closeButtonOver]) closeButton = [cell isEdited] ? sequelProCloseDirtyButtonOver : sequelProCloseButtonOver;
         if ([cell closeButtonPressed]) closeButton = [cell isEdited] ? sequelProCloseDirtyButtonDown : sequelProCloseButtonDown;
-        
-        closeButtonSize = [closeButton size];
-		
+
         if ([controlView isFlipped]) {
             closeButtonRect.origin.y += closeButtonRect.size.height;
         }
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index eea43ba9..5575d8b7 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -201,6 +201,7 @@
 	[nibObjectsToRelease release];
 
 	if (favorites) [favorites release];
+	if (favoritesRoot) [favoritesRoot release], favoritesRoot = nil;
 #endif
 	if (mySQLConnection) [mySQLConnection release];
 	if (sshTunnel) [sshTunnel setConnectionStateChangeSelector:nil delegate:nil], [sshTunnel disconnect], [sshTunnel release];
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
index b8ab78e2..8a2bc021 100644
--- a/Source/SPCustomQuery.m
+++ b/Source/SPCustomQuery.m
@@ -798,6 +798,7 @@
 	// if(!queriesSeparatedByDelimiter) // TODO: How to combine queries delimited by DELIMITER?
 	usedQuery = [[NSString stringWithString:[tempQueries componentsJoinedByString:@";\n"]] retain];
 
+	if (lastExecutedQuery) [lastExecutedQuery release];
 	lastExecutedQuery = [[tempQueries lastObject] retain];
 
 	// Perform empty query if no query is given
@@ -3705,6 +3706,7 @@
 	if ((self = [super init])) {
 
 		usedQuery = [[NSString stringWithString:@""] retain];
+		lastExecutedQuery = nil;
 		fieldIDQueryString = nil;
 		sortField = nil;
 		isDesc = NO;
@@ -4040,6 +4042,7 @@
 
 	[self clearQueryLoadTimer];
 	[usedQuery release];
+	[lastExecutedQuery release];
 	[resultData release];
 	[favoritesManager release];
 
diff --git a/Source/SPWindowControllerDelegate.m b/Source/SPWindowControllerDelegate.m
index 220930de..31876263 100644
--- a/Source/SPWindowControllerDelegate.m
+++ b/Source/SPWindowControllerDelegate.m
@@ -368,6 +368,7 @@
 	CGImageRef windowImage = CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, (unsigned int)[[self window] windowNumber], kCGWindowImageBoundsIgnoreFraming);
 	NSBitmapImageRep *viewRep = [[NSBitmapImageRep alloc] initWithCGImage:windowImage];
 	[viewImage addRepresentation:viewRep];
+	[viewRep release];
 	
 	// Calculate the titlebar+toolbar height
 	CGFloat contentViewOffsetY = [[self window] frame].size.height - [[[self window] contentView] frame].size.height;