From 5493c025bc290d10f446106c71e82c7c86bddd50 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 11 Dec 2013 10:14:55 -0800 Subject: [PATCH] Fix the color picker recent colors box on OS X SetBitmap triggers a size event, which results in UpdateBitmap being called again. For some reason, rather than being an infinite loop this just resulted in the bitmap never being set. --- aegisub/src/dialog_colorpicker.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp index 03d2a8822..7f4ae2bf5 100644 --- a/aegisub/src/dialog_colorpicker.cpp +++ b/aegisub/src/dialog_colorpicker.cpp @@ -291,7 +291,11 @@ class ColorPickerRecent : public wxStaticBitmap { } } - SetBitmap(background); + { + wxEventBlocker blocker(this); + SetBitmap(background); + } + Refresh(false); }