- Reorder window instantiation process to ensure window has had its size set before adding the main views, fixing resize issues including Issue #1141 on 10.6

 - Remove accidentally committed log line

2 files changed, 3 insertions, 2 deletions

diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index 2a784f86..271dd661 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -1221,7 +1221,6 @@ YY_BUFFER_STATE yy_scan_string (const char *);
 
 	// Create a new window controller, and set up a new connection view within it.
 	SPWindowController *newWindowController = [[SPWindowController alloc] initWithWindowNibName:@"MainWindow"];
-	[newWindowController addNewConnection:self];
 	NSWindow *newWindow = [newWindowController window];
 
 	// Cascading defaults to on - retrieve the window origin automatically assigned by cascading,
@@ -1237,6 +1236,9 @@ YY_BUFFER_STATE yy_scan_string (const char *);
 		[newWindow setFrameUsingName:@"DBView"];
 	}
 
+	// Add the connection view
+	[newWindowController addNewConnection:self];
+
 	// Cascade according to the statically stored cascade location.
 	cascadeLocation = [newWindow cascadeTopLeftFromPoint:cascadeLocation];
 
diff --git a/Source/SPWindow.m b/Source/SPWindow.m
index 2f5cf56e..9353e80d 100644
--- a/Source/SPWindow.m
+++ b/Source/SPWindow.m
@@ -124,7 +124,6 @@
 - (NSUndoManager *)undoManager
 {
 	if ([[self windowController] respondsToSelector:@selector(selectedTableDocument)]) {
-		NSLog(@"Test: %@", [[[[self windowController] selectedTableDocument] undoManager] description]);
 		return [[[self windowController] selectedTableDocument] undoManager];
 	}
 	return [super undoManager];