diff options
| author | rowanbeentje <rowan@beent.je> | 2011-06-20 22:32:37 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2011-06-20 22:32:37 +0000 |
| commit | 3828e4ced24e5f8125a5d95c78a1c7e0c9bed39a (patch) | |
| tree | f84a03866f2a8ab0cbc6b52e93fc41ec936ad58c | |
| parent | f589953f799a2288f9d9bb24f97c60a8056ad67e (diff) | |
| download | sequelpro-3828e4ced24e5f8125a5d95c78a1c7e0c9bed39a.tar.gz sequelpro-3828e4ced24e5f8125a5d95c78a1c7e0c9bed39a.tar.bz2 sequelpro-3828e4ced24e5f8125a5d95c78a1c7e0c9bed39a.zip | |
- Fix exceptions seen in 0.9.9RC related to query favorites with nil query texts (L2239)
- Update localisable strings
| -rw-r--r-- | Resources/English.lproj/BundleEditor.strings | bin | 19640 -> 18378 bytes | |||
| -rw-r--r-- | Resources/English.lproj/MainMenu.strings | bin | 45312 -> 45642 bytes | |||
| -rw-r--r-- | Source/SPCustomQuery.m | 8 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Resources/English.lproj/BundleEditor.strings b/Resources/English.lproj/BundleEditor.strings Binary files differindex 56496dce..d038f58e 100644 --- a/Resources/English.lproj/BundleEditor.strings +++ b/Resources/English.lproj/BundleEditor.strings diff --git a/Resources/English.lproj/MainMenu.strings b/Resources/English.lproj/MainMenu.strings Binary files differindex 4c048340..3d149080 100644 --- a/Resources/English.lproj/MainMenu.strings +++ b/Resources/English.lproj/MainMenu.strings diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m index e51da22c..eacffe3b 100644 --- a/Source/SPCustomQuery.m +++ b/Source/SPCustomQuery.m @@ -3408,7 +3408,9 @@ initWithString:([favorite objectForKey:@"tabtrigger"] && [(NSString*)[favorite objectForKey:@"tabtrigger"] length]) ? [NSString stringWithFormat:@"%@\t%@⇥", [favorite objectForKey:@"name"], [favorite objectForKey:@"tabtrigger"]] : [favorite objectForKey:@"name"] attributes:attributes] autorelease]; NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""]; - [item setToolTip:[NSString stringWithString:[favorite objectForKey:@"query"]]]; + if ([favorite objectForKey:@"query"]) { + [item setToolTip:[NSString stringWithString:[favorite objectForKey:@"query"]]]; + } [item setAttributedTitle:titleString]; [item setIndentationLevel:1]; [menu addItem:item]; @@ -3433,7 +3435,9 @@ initWithString:([favorite objectForKey:@"tabtrigger"] && [(NSString*)[favorite objectForKey:@"tabtrigger"] length]) ? [NSString stringWithFormat:@"%@\t%@⇥", [favorite objectForKey:@"name"], [favorite objectForKey:@"tabtrigger"]] : [favorite objectForKey:@"name"] attributes:attributes] autorelease]; NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""]; - [item setToolTip:[NSString stringWithString:[favorite objectForKey:@"query"]]]; + if ([favorite objectForKey:@"query"]) { + [item setToolTip:[NSString stringWithString:[favorite objectForKey:@"query"]]]; + } [item setAttributedTitle:titleString]; [item setIndentationLevel:1]; [menu addItem:item]; |