From 28e5942c59c8d142f46e9f1e455c2b633db4cf23 Mon Sep 17 00:00:00 2001 From: jules Date: Sun, 1 Apr 2012 11:56:11 +0100 Subject: [PATCH] Fix for win32 NamedPipe::isOpen(). --- modules/juce_core/native/juce_posix_NamedPipe.cpp | 5 +++++ modules/juce_core/native/juce_win32_Files.cpp | 7 +++++++ modules/juce_core/network/juce_NamedPipe.cpp | 5 ----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/juce_core/native/juce_posix_NamedPipe.cpp b/modules/juce_core/native/juce_posix_NamedPipe.cpp index d4df43bf97..4ef02cee6e 100644 --- a/modules/juce_core/native/juce_posix_NamedPipe.cpp +++ b/modules/juce_core/native/juce_posix_NamedPipe.cpp @@ -201,3 +201,8 @@ int NamedPipe::write (const void* sourceBuffer, int numBytesToWrite, int timeOut { return pimpl != nullptr ? pimpl->write (static_cast (sourceBuffer), numBytesToWrite, timeOutMilliseconds) : -1; } + +bool NamedPipe::isOpen() const +{ + return pimpl != nullptr; +} diff --git a/modules/juce_core/native/juce_win32_Files.cpp b/modules/juce_core/native/juce_win32_Files.cpp index a14af1fe19..f3d1fd6ddf 100644 --- a/modules/juce_core/native/juce_win32_Files.cpp +++ b/modules/juce_core/native/juce_win32_Files.cpp @@ -795,6 +795,8 @@ public: } } + bool isConnected() const noexcept { return connected; } + HANDLE pipeH, cancelEvent; bool connected, isPipe; }; @@ -808,6 +810,11 @@ NamedPipe::~NamedPipe() close(); } +bool NamedPipe::isOpen() const +{ + return pimpl != nullptr && pimpl->connected; +} + void NamedPipe::cancelPendingReads() { if (pimpl != nullptr) diff --git a/modules/juce_core/network/juce_NamedPipe.cpp b/modules/juce_core/network/juce_NamedPipe.cpp index da1363325f..da13493f95 100644 --- a/modules/juce_core/network/juce_NamedPipe.cpp +++ b/modules/juce_core/network/juce_NamedPipe.cpp @@ -35,11 +35,6 @@ bool NamedPipe::createNewPipe (const String& pipeName) return openInternal (pipeName, true); } -bool NamedPipe::isOpen() const -{ - return pimpl != nullptr; -} - String NamedPipe::getName() const { return currentPipeName;