amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 21:47:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't allocate wxToolBarToolBase, that can lead to memory corruption and two days of debugging.

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-04 00:43:58 +02:00
parent b1595c9179
commit 07fe2406e7
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/util.cpp
+2 -6
View File
@@ -290,13 +290,9 @@ wxToolBarToolBase* add_tool(wxToolBar* toolbar, int id, const char* resource, co
#else #else
Image disabled_bitmap = generate_disabled_image(bitmap); Image disabled_bitmap = generate_disabled_image(bitmap);
#endif #endif
auto tool = new wxToolBarToolBase(toolbar, id, label, bitmap, disabled_bitmap, kind, nullptr, tooltip, help); return toolbar->AddTool(id, label, bitmap, disabled_bitmap, kind, tooltip, help);
toolbar->AddTool(tool);
return tool;
} else { } else {
auto tool = new wxToolBarToolBase(toolbar, id, label, wxNullBitmap, wxNullBitmap, kind, nullptr, tooltip, help); return toolbar->AddTool(id, label, wxNullBitmap, wxNullBitmap, kind, tooltip, help);
toolbar->AddTool(tool);
return tool;
} }
} }