aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2010-04-24 01:41:02 +0000
committerrowanbeentje <rowan@beent.je>2010-04-24 01:41:02 +0000
commitf8bfc9ff86a6b36de1f1223cf69cc82573f75bce (patch)
treeb3eb53786a65f84123b95a82720fe3e3b6126af6
parentefa3cf18d0d484fb0c5f2d7a1d19a225aa73259d (diff)
downloadsequelpro-f8bfc9ff86a6b36de1f1223cf69cc82573f75bce.tar.gz
sequelpro-f8bfc9ff86a6b36de1f1223cf69cc82573f75bce.tar.bz2
sequelpro-f8bfc9ff86a6b36de1f1223cf69cc82573f75bce.zip
Merge in minor fixes from 0.9.8 RC merge review:
- Make a tiny fix to narrow down completion to avoid memory overrelease issues - Unhide the "Show create view syntax" menu and contextual menu items when selecting a view
-rw-r--r--Source/SPNarrowDownCompletion.m4
-rw-r--r--Source/TablesList.m2
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/SPNarrowDownCompletion.m b/Source/SPNarrowDownCompletion.m
index 322e65cc..668e01c1 100644
--- a/Source/SPNarrowDownCompletion.m
+++ b/Source/SPNarrowDownCompletion.m
@@ -153,7 +153,7 @@
[mutablePrefix release];
[textualInputCharacters release];
[originalFilterString release];
- [syncArrowImages release];
+ if(syncArrowImages) [syncArrowImages release];
if(suggestions) [suggestions release];
if (filtered) [filtered release];
@@ -184,7 +184,7 @@
[stateTimer invalidate];
[stateTimer release];
stateTimer = nil;
- if(syncArrowImages) [syncArrowImages release];
+ if(syncArrowImages) [syncArrowImages release], syncArrowImages = nil;
[self performSelectorOnMainThread:@selector(reInvokeCompletion) withObject:nil waitUntilDone:YES];
closeMe = YES;
return;
diff --git a/Source/TablesList.m b/Source/TablesList.m
index 763638e5..e39da649 100644
--- a/Source/TablesList.m
+++ b/Source/TablesList.m
@@ -926,6 +926,7 @@
[duplicateTableMenuItem setTitle:NSLocalizedString(@"Duplicate View...", @"duplicate view menu title")];
[truncateTableButton setHidden:YES];
[removeTableMenuItem setTitle:NSLocalizedString(@"Delete View", @"delete view menu title")];
+ [showCreateSyntaxMenuItem setHidden:NO];
[showCreateSyntaxMenuItem setTitle:NSLocalizedString(@"Show Create View Syntax...", @"show create view syntax menu item")];
[renameTableContextMenuItem setHidden:NO]; // we don't have to check the mysql version
@@ -934,6 +935,7 @@
[duplicateTableContextMenuItem setTitle:NSLocalizedString(@"Duplicate View...", @"duplicate view menu title")];
[truncateTableContextButton setHidden:YES];
[removeTableContextMenuItem setTitle:NSLocalizedString(@"Delete View", @"delete view menu title")];
+ [showCreateSyntaxContextMenuItem setHidden:NO];
[showCreateSyntaxContextMenuItem setTitle:NSLocalizedString(@"Show Create View Syntax...", @"show create view syntax menu item")];
}
else if (selectedTableType == SPTableTypeTable) {