Mirrors/gBar
1
0
Fork 0
mirror of https://github.com/scorpion-26/gBar.git synced 2024-11-22 03:02:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix gtk_widget_destroy warnings

Browse source 
gtk_remove_widget unrefs the widget and destroys it and all its children.
Since we also do that in the destructor, we do a double free.
To fix this, a ref is added to prevent destroying by gtk_remove_widget.
This commit is contained in:
scorpion-26 2023-11-05 22:01:09 +01:00
parent f0d3c6c0e4
commit eb8e0bc2b5
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Widget.cpp
View file

@ -47,9 +47,12 @@ namespace Utils
Widget::~Widget() Widget::~Widget()
{ {
m_Childs.clear(); if (m_Widget)
LOG("Destroy widget"); {
gtk_widget_destroy(m_Widget); LOG("Destroy widget and its children");
m_Childs.clear();
gtk_widget_destroy(m_Widget);
}
} }
void Widget::CreateAndAddWidget(Widget* widget, GtkWidget* parentWidget) void Widget::CreateAndAddWidget(Widget* widget, GtkWidget* parentWidget)
@ -144,8 +147,10 @@ void Widget::RemoveChild(Widget* widget)
{ {
if (m_Widget) if (m_Widget)
{ {
LOG("Remove widget from parent");
// Ref the widget, so we don't mess up the RAII cleanup below
g_object_ref(it->get()->m_Widget);
gtk_container_remove((GtkContainer*)m_Widget, it->get()->m_Widget); gtk_container_remove((GtkContainer*)m_Widget, it->get()->m_Widget);
it->get()->m_Widget = nullptr;
} }
m_Childs.erase(it); m_Childs.erase(it);
} }