Changeset 374

Show
Ignore:
Timestamp:
04/09/07 21:39:19 (1 year ago)
Author:
hagedorn
Message:

It is too bright in here. Fixed quitting laserline2.0 app

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/LaserLine_2.0/Src/MainController.m

    r373 r374  
    5555 
    5656- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender { 
    57          
    58         if ([output stopDevice]) { 
    59                 NSLog(@"applicationShouldTerminate: later..."); 
    60                 return NSTerminateLater; 
    61         } 
    62         NSLog(@"applicationShouldTerminate: now!"); 
    63           
    64          /* 
     57 
    6558        [output stopDevice]; 
    66         sleep(1); 
    67          */ 
     59 
    6860        return NSTerminateNow; 
    6961} 

  • trunk/LaserLine_2.0/Src/OutputController/DeviceController.m

    r369 r374  
    33#import "FrameNotificationCenter.h" 
    44#import "JRLog.h" 
     5#import "RawTypes.h" 
    56 
    67@implementation DeviceController 
    …… 
    2930 
    3031- (BOOL)stopDriver { 
    31         if (!myDriverThreadRunning) 
    32                 return NO; 
     32 
    3333        NSLog(@"setting myDriverStop = YES"); 
    3434        myDriverStop = YES; 
    3535        myDriverThreadRunning = NO; 
     36        NSData *frame = [NSData dataWithBytes: &NullRawFrame length: sizeof(NullRawFrame)]; 
     37        [myDriverThread displayFrame:frame]; 
    3638        return YES; 
    3739} 

  • trunk/LaserLine_2.0/Src/OutputController/EasyLaseDriverThread.m

    r373 r374  
    111111        [self stopCards]; 
    112112        JRLogDebug(@"Driver Thread is exiting."); 
    113          
    114         NSInvocation *reply = 
    115                 [NSInvocation invocationWithMethodSignature:[NSApp methodSignatureForSelector:@selector(replyToApplicationShouldTerminate:)]]; 
    116         [reply setTarget:NSApp]; 
    117         [reply setArgument:(void *)YES atIndex:2]; 
    118         [reply performSelectorOnMainThread:@selector(invoke) withObject:nil waitUntilDone:NO]; 
    119          
    120           
    121113        [pool release]; 
    122114}