unirec++ - inputInterface - dont send EoF if interface is on initiali…

…zed, dont set empty template
CESNET · Jul 25, 2024 · a415c3e · a415c3e
1 parent 085af3d
commit a415c3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/unirec/include/unirec++/outputInterface.hpp b/unirec/include/unirec++/outputInterface.hpp
@@ -137,6 +137,7 @@ class UnirecOutputInterface {
 	ur_template_t* m_template = nullptr;
 	uint8_t m_interfaceID;
 	bool m_sendEoFonExit;
+	bool m_isInitialized;
 	UnirecRecord m_unirecRecord;
 
 	friend class Unirec;

diff --git a/unirec/unirec++/outputInterface.cpp b/unirec/unirec++/outputInterface.cpp
@@ -17,12 +17,13 @@ UnirecOutputInterface::UnirecOutputInterface(uint8_t interfaceID)
 	: m_template(nullptr)
 	, m_interfaceID(interfaceID)
 	, m_sendEoFonExit(true)
+	, m_isInitialized(false)
 {
 }
 
 UnirecOutputInterface::~UnirecOutputInterface()
 {
-	if (m_sendEoFonExit) {
+	if (m_sendEoFonExit && m_isInitialized) {
 		sendEoF();
 	}
 
@@ -88,7 +89,7 @@ void UnirecOutputInterface::setAutoflushTimeout(int timeout)
 
 void UnirecOutputInterface::sendEoF() const
 {
-	char dummy[1] = {0};
+	char dummy[1] = { 0 };
 	trap_send(m_interfaceID, dummy, sizeof(dummy));
 }
 
@@ -116,6 +117,8 @@ void UnirecOutputInterface::changeTemplate(const std::string& templateFields)
 			"created.");
 	}
 	m_unirecRecord = createUnirecRecord();
+
+	m_isInitialized = true;
 }
 
 UnirecRecord UnirecOutputInterface::createUnirecRecord(size_t maxVariableFieldsSize)