Merge branch 'next' into ediInput

2 files changed, 4 insertions, 4 deletions

diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp
index 9ff28a3..489787f 100644
--- a/src/DabMultiplexer.cpp
+++ b/src/DabMultiplexer.cpp
@@ -284,13 +284,13 @@ void DabMultiplexer::prepare_services_components()
                     component->subchId, component->serviceId);
             throw MuxInitException();
         }
-        if ((*subchannel)->type != subchannel_type_t::Packet) continue;
 
-        component->packet.id = cur_packetid++;
+        if ((*subchannel)->type == subchannel_type_t::Packet) {
+            component->packet.id = cur_packetid++;
+        }
 
         rcs.enrol(component.get());
     }
-
 }
 
 void DabMultiplexer::prepare_data_inputs()
diff --git a/src/zmq2edi/zmq2edi.cpp b/src/zmq2edi/zmq2edi.cpp
index a2daf49..3888d8a 100644
--- a/src/zmq2edi/zmq2edi.cpp
+++ b/src/zmq2edi/zmq2edi.cpp
@@ -169,7 +169,7 @@ static void add_edi_destination(void)
     }
 
     edi_conf.destinations.push_back(move(edi_destination));
-    edi_destination.reset();
+    edi_destination = std::make_shared<edi::udp_destination_t>();
 
     source_port_set = false;
     source_addr_set = false;