mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix crash when selecting pure black in the color picker when the recent colors list isn't full

Browse source 
Originally committed to SVN as r6534.
This commit is contained in:
Thomas Goyne 2012-03-07 01:31:04 +00:00
parent 110c2358a6
commit bb9859c70f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
aegisub/src/dialog_colorpicker.cpp
View file

@ -470,8 +470,11 @@ wxString ColorPickerRecent::StoreToString()
void ColorPickerRecent::AddColor(wxColour color)
{
colors.erase(remove(colors.begin(), colors.end(), color), colors.end());
colors.insert(colors.begin(), color);
std::vector<wxColour>::iterator existing = find(colors.begin(), colors.end(), color);
if (existing != colors.end())
rotate(colors.begin(), existing, existing + 1);
else
colors.insert(colors.begin(), color);
background_valid = false;