From 998fc633b9063fb4208751ebbe9bd3277510aa59 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Tue, 12 Jun 2012 03:13:58 +0000
Subject: [PATCH] osx: Fix assertion failure when expanding hotkey categories

Originally committed to SVN as r6899.
---
 aegisub/src/hotkey_data_view_model.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/aegisub/src/hotkey_data_view_model.cpp b/aegisub/src/hotkey_data_view_model.cpp
index ca43006a2..e69635cca 100644
--- a/aegisub/src/hotkey_data_view_model.cpp
+++ b/aegisub/src/hotkey_data_view_model.cpp
@@ -96,8 +96,10 @@ public:
 		if (col == 0)
 			variant = combo.Str();
 		else if (col == 1) {
+			wxBitmap icon_bmp(icon::get(combo.CmdName(), 16));
 			wxIcon icon;
-			icon.CopyFromBitmap(icon::get(combo.CmdName(), 16));
+			if (icon_bmp.IsOk())
+				icon.CopyFromBitmap(icon_bmp);
 			variant << wxDataViewIconText(combo.CmdName(), icon);
 		}
 		else if (col == 2) {