From 335da63e26ce60aa3e23f4653fb5433a27bcee5f Mon Sep 17 00:00:00 2001
From: Stephane Letz <letz@grame.fr>
Date: Wed, 14 Nov 2012 10:56:00 +0100
Subject: [PATCH] Cleanup in JackPortAudioDriver.

---
 windows/portaudio/JackPortAudioDriver.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/windows/portaudio/JackPortAudioDriver.cpp b/windows/portaudio/JackPortAudioDriver.cpp
index 2c6c6098..4fffd6ce 100644
--- a/windows/portaudio/JackPortAudioDriver.cpp
+++ b/windows/portaudio/JackPortAudioDriver.cpp
@@ -250,10 +250,9 @@ error:
 int JackPortAudioDriver::Close()
 {
     // Generic audio driver close
-    int res = JackAudioDriver::Close();
     jack_log("JackPortAudioDriver::Close");
-    Pa_CloseStream(fStream);
-    return res;
+    int res = JackAudioDriver::Close();
+    return (Pa_CloseStream(fStream) != paNoError) ? -1 : res;
 }
 
 int JackPortAudioDriver::Attach()
@@ -293,8 +292,7 @@ int JackPortAudioDriver::Start()
 {
     jack_log("JackPortAudioDriver::Start");
     if (JackAudioDriver::Start() >= 0) {
-        PaError err = Pa_StartStream(fStream);
-        if (err == paNoError) {
+        if (Pa_StartStream(fStream) == paNoError) {
             return 0;
         }
         JackAudioDriver::Stop();
@@ -305,8 +303,7 @@ int JackPortAudioDriver::Start()
 int JackPortAudioDriver::Stop()
 {
     jack_log("JackPortAudioDriver::Stop");
-    PaError err = Pa_StopStream(fStream);
-    int res = (err == paNoError) ? 0 : -1;
+    int res = (Pa_StopStream(fStream) == paNoError) ? 0 : -1;
     if (JackAudioDriver::Stop() < 0) {
         res = -1;
     }
-- 
2.11.4.GIT