aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPAppController.m
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2010-12-17 21:46:35 +0000
committerstuconnolly <stuart02@gmail.com>2010-12-17 21:46:35 +0000
commit2bb0262375af1ca9a0a31943e1982b2b3cb7ae56 (patch)
treef140d93c8674fa3658e168e057b070143a2795cc /Source/SPAppController.m
parent2f1146de80e658021e6a0fc63a20b039f73cca06 (diff)
parent072a730f22e3c06fed48acf31ac5708259c93a32 (diff)
downloadsequelpro-2bb0262375af1ca9a0a31943e1982b2b3cb7ae56.tar.gz
sequelpro-2bb0262375af1ca9a0a31943e1982b2b3cb7ae56.tar.bz2
sequelpro-2bb0262375af1ca9a0a31943e1982b2b3cb7ae56.zip
Bring outline view branch up to date with trunk (r3030:3035).
Diffstat (limited to 'Source/SPAppController.m')
-rw-r--r--Source/SPAppController.m30
1 files changed, 5 insertions, 25 deletions
diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index 2117a3ac..879ea116 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -659,36 +659,16 @@
}
}
- BOOL userTerminated = NO;
-
- // while(1) {
- // NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
- // untilDate:[NSDate distantPast]
- // inMode:NSDefaultRunLoopMode
- // dequeue:YES];
- //
- // if ([event type] == NSKeyDown) {
- // unichar key = [[event characters] length] == 1 ? [[event characters] characterAtIndex:0] : 0;
- // if (([event modifierFlags] & NSCommandKeyMask) && key == '.') {
- // userTerminated = YES;
- // break;
- // }
- // }
- // [NSApp sendEvent:event];
- // if(![processDocument isWorking]) break;
- // usleep(1000);
- // }
- //
- // if(userTerminated) {
- // NSBeep();
- // return;
- // }
+ // if no processDoc found and no passedProcessID was passed execute
+ // command at front most doc
+ if(!processDocument && !passedProcessID)
+ processDocument = [[[self frontDocumentWindow] delegate] selectedTableDocument];
if(processDocument && command) {
if([command isEqualToString:@"passToDoc"]) {
NSMutableDictionary *cmdDict = [NSMutableDictionary dictionary];
[cmdDict setObject:parameter forKey:@"parameter"];
- [cmdDict setObject:passedProcessID forKey:@"id"];
+ [cmdDict setObject:(passedProcessID)?:@"" forKey:@"id"];
[processDocument handleSchemeCommand:cmdDict];
return;
}