Merge pull request #130 from niklasva/cpp_teardown_ctx

C++ wrapper, only call teardown in destructors if context exists
goToMain · Sep 3, 2023 · 3c762ea · 3c762ea
2 parents 97b9c11 + 1f293bb
commit 3c762ea
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/include/osdp.hpp b/include/osdp.hpp
@@ -64,11 +64,14 @@ class ControlPanel : public Common {
 public:
 	ControlPanel()
 	{
+		_ctx = nullptr;
 	}
 
 	~ControlPanel()
 	{
-		osdp_cp_teardown(_ctx);
+		if (_ctx) {
+			osdp_cp_teardown(_ctx);
+		}
 	}
 
 	bool setup(int num_pd, osdp_pd_info_t *info)
@@ -108,11 +111,14 @@ class PeripheralDevice : public Common {
 public:
 	PeripheralDevice()
 	{
+		_ctx = nullptr;
 	}
 
 	~PeripheralDevice()
 	{
-		osdp_pd_teardown(_ctx);
+		if (_ctx) {
+			osdp_pd_teardown(_ctx);
+		}
 	}
 
 	bool setup(osdp_pd_info_t *info)