- Ensure that the structure view is always selected on program launch, whatever the last view used in IB is

 - Move setAutoEnablesItems:NO from the CustomQuery file to the menu definition in the .xib

1 files changed, 1 insertions, 5 deletions

diff --git a/Source/CustomQuery.m b/Source/CustomQuery.m
index 95de8d9b..a5c7e8db 100644
--- a/Source/CustomQuery.m
+++ b/Source/CustomQuery.m
@@ -801,6 +801,7 @@ sets the tableView columns corresponding to the mysql-result
 				// If there is a previous query and the position should be associated with it, do so.
 				if (i && positionAssociatedWithPreviousQuery && [[[queries objectAtIndex:i-1] stringByTrimmingCharactersInSet:newlineSet] length]) {
 					query = [NSString stringWithString:[queries objectAtIndex:i-1]];
+					queryStartPosition = lastQueryStartPosition;
 					break;
 				}
 
@@ -915,8 +916,6 @@ sets the connection (received from TableDocument) and makes things that have to
 	}
 	[self setFavorites];
 	
-	// To be able to disable runSelectionMenuItem
-	[[runSelectionMenuItem menu] setAutoenablesItems:NO];
 	// Disable runSelectionMenuItem in the gear menu
 	[runSelectionMenuItem setEnabled:NO];
 	
@@ -1249,9 +1248,6 @@ traps enter key and
 	// Ensure that the notification is from the custom query text view
 	if ( [aNotification object] != textView ) return;
 
-	// To be able to disable runSelectionMenuItem
-	[[runSelectionMenuItem menu] setAutoenablesItems:NO];
-
 	// If no text is selected, disable the button and action menu.
 	if ( [textView selectedRange].location == NSNotFound ) {
 		[runSelectionButton setEnabled:NO];