From bfcc0dd7a5128fcde3a2c064bc95afcf818158e6 Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 4 Apr 2012 10:10:41 +0100 Subject: [PATCH] Minor NamedPipe tweak. --- modules/juce_core/native/juce_posix_NamedPipe.cpp | 1 + .../juce_events/interprocess/juce_InterprocessConnection.cpp | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/juce_core/native/juce_posix_NamedPipe.cpp b/modules/juce_core/native/juce_posix_NamedPipe.cpp index 4ef02cee6e..603e0dcb35 100644 --- a/modules/juce_core/native/juce_posix_NamedPipe.cpp +++ b/modules/juce_core/native/juce_posix_NamedPipe.cpp @@ -169,6 +169,7 @@ void NamedPipe::cancelPendingReads() void NamedPipe::close() { + cancelPendingReads(); ScopedPointer deleter (pimpl); // (clears the pimpl member variable before deleting it) } diff --git a/modules/juce_events/interprocess/juce_InterprocessConnection.cpp b/modules/juce_events/interprocess/juce_InterprocessConnection.cpp index a2619f4706..fb8c9c31ed 100644 --- a/modules/juce_events/interprocess/juce_InterprocessConnection.cpp +++ b/modules/juce_events/interprocess/juce_InterprocessConnection.cpp @@ -106,10 +106,7 @@ void InterprocessConnection::disconnect() socket->close(); if (pipe != nullptr) - { - pipe->cancelPendingReads(); pipe->close(); - } stopThread (4000);