In NetworkCallbackController::Unschedule*Stream(), don't proceed if the streams are...

diff --git a/CHANGES b/CHANGES
index 226579d6be30121595b84a003e0e7a4d8d174eaa..c4d3ab9cc6e0c6084dc4a89e94d025eab5e91111 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ MacGDBp                                                               CHANGE LOG
 1.4.1
 #####################
 - Fix: Objects with nested objects wouldn't always load their child keys
+- Fix: #213  Crash when unchecking "Attached" when the debugger is inactive
 
 
 1.4 Beta 2

diff --git a/Source/NetworkCallbackController.mm b/Source/NetworkCallbackController.mm
index 73c032a2b92c0895eaafc8397207f1c9000e21ab..a9c4cb39b87834554897e74b7a92c413079ee767 100644 (file)
--- a/Source/NetworkCallbackController.mm
+++ b/Source/NetworkCallbackController.mm
@@ -213,6 +213,8 @@ void NetworkCallbackController::OnWriteStreamEvent(CFWriteStreamRef stream,
 
 void NetworkCallbackController::UnscheduleReadStream()
 {
+  if (!connection_.readStream)
+    return;
   CFReadStreamUnscheduleFromRunLoop(connection_.readStream, runLoop_, kCFRunLoopCommonModes);
   CFReadStreamClose(connection_.readStream);
   CFRelease(connection_.readStream);    
@@ -221,6 +223,8 @@ void NetworkCallbackController::UnscheduleReadStream()
 
 void NetworkCallbackController::UnscheduleWriteStream()
 {
+  if (!connection_.writeStream)
+    return;
   CFWriteStreamUnscheduleFromRunLoop(connection_.writeStream, runLoop_, kCFRunLoopCommonModes);
   CFWriteStreamClose(connection_.writeStream);
   CFRelease(connection_.writeStream);