mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

osx: Fix assertion failure when expanding hotkey categories

Browse source 
Originally committed to SVN as r6899.
This commit is contained in:
Thomas Goyne 2012-06-12 03:13:58 +00:00
parent 2db20778fc
commit 998fc633b9
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/src/hotkey_data_view_model.cpp
View file

@ -96,8 +96,10 @@ public:
if (col == 0) if (col == 0)
variant = combo.Str(); variant = combo.Str();
else if (col == 1) { else if (col == 1) {
wxBitmap icon_bmp(icon::get(combo.CmdName(), 16));
wxIcon icon; wxIcon icon;
icon.CopyFromBitmap(icon::get(combo.CmdName(), 16)); if (icon_bmp.IsOk())
icon.CopyFromBitmap(icon_bmp);
variant << wxDataViewIconText(combo.CmdName(), icon); variant << wxDataViewIconText(combo.CmdName(), icon);
} }
else if (col == 2) { else if (col == 2) {