From fd41eef1e08dc0f723addc13f49d49eef30b6c45 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 6 Aug 2020 11:45:27 +0200
Subject: [PATCH] Fix receiver termination when using the Osmosdr_Signal_Source
 implementation for the SignalSource block

---
 docs/changelog.md                   | 2 ++
 src/core/receiver/gnss_flowgraph.cc | 1 +
 2 files changed, 3 insertions(+)

diff --git a/docs/changelog.md b/docs/changelog.md
index 9024bcdc0..501abd6d6 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -23,6 +23,8 @@ SPDX-FileCopyrightText: 2011-2020 Carles Fernandez-Prades <carles.fernandez@cttc
   parameters for the `DataTypeAdapter`, `InputFilter` and `Resampler` blocks are
   ignored. This was the default behavior in GNSS-SDR v0.0.12, but it changed in
   v0.0.13. This change recovers the old behavior.
+- Fixed the termination of the receiver with `q` + `[Enter]` keys when using the
+  `Osmosdr_Signal_Source` implementation of the `SignalSource` block.
 - Improved General Block diagram, both in content and in image resolution.
 
 &nbsp;
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index e86e59d69..85c739183 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -121,6 +121,7 @@ void GNSSFlowgraph::stop()
             chan->stop_channel();  // stop the acquisition or tracking operation
         }
     top_block_->stop();
+    top_block_->wait();
     running_ = false;
 }