client: properly release objects on destroy

hyprwm · Jun 22, 2024 · 914f083 · 914f083
1 parent 1413398
commit 914f083
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -871,6 +871,16 @@ void {}::onDestroyCalled() {{
                                   IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL, IFACE_NAME + "_interface", IFACE_CLASS_NAME_CAMEL, IFACE_VTABLE_NAME, IFACE_CLASS_NAME_CAMEL,
                                   IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL);
         } else {
+            std::string DTOR_FUNC = "";
+
+            for (auto& rq : iface.requests) {
+                if (!rq.destructor)
+                    continue;
+
+                DTOR_FUNC = camelize("send_" + rq.name) + "()";
+                break;
+            }
+
             SOURCE += std::format(R"#(
 {}::{}(wl_resource* resource) {{
     pResource = resource;
@@ -883,10 +893,10 @@ void {}::onDestroyCalled() {{
 
 {}::~{}() {{
     if (!destroyed)
-        wl_proxy_destroy(pResource);
+        {};
 }}
 )#",
-                                  IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL, IFACE_VTABLE_NAME, IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL);
+                                  IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL, IFACE_VTABLE_NAME, IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL, DTOR_FUNC);
         }
 
         for (auto& rq : (clientCode ? iface.events : iface.requests)) {