From c261cca84b702a83ded9a06017804aef019322fe Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Fri, 1 Apr 2011 12:10:12 +0000
Subject: [PATCH] Correct JackNetOneDriver::Close.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4245 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 ChangeLog                   | 1 +
 common/JackNetOneDriver.cpp | 7 +++++--
 common/JackServer.cpp       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e4038ab3..7dc08efa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@ Valerio Pilo
 
 	* Merge newer-midi branch (Devin Anderson redesign of the MIDI drivers: alsarawmidi, ffado, coremidi and winmme).
 	* Cleanup JackThreadedDriver::Stop.
+	* Correct JackNetOneDriver::Close.
 
 2011-03-30 Stephane Letz  <letz@grame.fr>
 
diff --git a/common/JackNetOneDriver.cpp b/common/JackNetOneDriver.cpp
index 93adecdd..9d3b59ee 100644
--- a/common/JackNetOneDriver.cpp
+++ b/common/JackNetOneDriver.cpp
@@ -118,9 +118,12 @@ namespace Jack
 
     int JackNetOneDriver::Close()
     {
+        // Generic audio driver close
+        int res = JackAudioDriver::Close();
+
         FreePorts();
-        netjack_release( &netj );
-        return JackDriver::Close();
+        netjack_release(&netj);
+        return res;
     }
 
     int JackNetOneDriver::Attach()
diff --git a/common/JackServer.cpp b/common/JackServer.cpp
index e1bcbb8a..22027c9c 100644
--- a/common/JackServer.cpp
+++ b/common/JackServer.cpp
@@ -58,7 +58,7 @@ JackServer::JackServer(bool sync, bool temporary, int timeout, bool rt, int prio
         new JackFreewheelDriver(fEngine, GetSynchroTable());
     fThreadedFreewheelDriver = new JackThreadedDriver(freewheelDriver);
 
-   fFreewheelDriver = freewheelDriver;
+    fFreewheelDriver = freewheelDriver;
     fDriverInfo = new JackDriverInfo();
     fAudioDriver = NULL;
     fFreewheel = false;