Changeset 36

Show
Ignore:
Timestamp:
10/05/05 06:09:48 (3 years ago)
Author:
ross
Message:

fixed bug where RunUntilSigInt?() could only be called once, second time caused assertion failure

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • oscpack/trunk/ip/posix/UdpSocket.cpp

    r29 r36  
    482482void SocketReceiveMultiplexer::RunUntilSigInt() 
    483483{ 
    484   assert( multiplexerInstanceToAbortWithSigInt_ == 0 ); 
     484  assert( multiplexerInstanceToAbortWithSigInt_ == 0 ); /* at present we support only one multiplexer instance running until sig int */ 
    485485  multiplexerInstanceToAbortWithSigInt_ = this; 
    486486  signal( SIGINT, InterruptSignalHandler ); 
    487487  impl_->Run(); 
     488  signal( SIGINT, SIG_DFL ); 
     489  multiplexerInstanceToAbortWithSigInt_ = 0; 
    488490} 
    489491 

  • oscpack/trunk/ip/win32/UdpSocket.cpp

    r29 r36  
    502502void SocketReceiveMultiplexer::RunUntilSigInt() 
    503503{ 
    504   assert( multiplexerInstanceToAbortWithSigInt_ == 0 ); 
     504  assert( multiplexerInstanceToAbortWithSigInt_ == 0 ); /* at present we support only one multiplexer instance running until sig int */ 
    505505  multiplexerInstanceToAbortWithSigInt_ = this; 
    506506  signal( SIGINT, InterruptSignalHandler ); 
    507507  impl_->Run(); 
     508  signal( SIGINT, SIG_DFL ); 
     509  multiplexerInstanceToAbortWithSigInt_ = 0; 
    508510} 
    509511