From 1d020b851ecd1febcfec5c3ce1b702f3f64f862f Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sun, 25 Nov 2012 16:47:39 -0800
Subject: [PATCH] Add picked colors to the recently used colors

---
 aegisub/src/dialog_colorpicker.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp
index 7d91503c5..9ddab36a8 100644
--- a/aegisub/src/dialog_colorpicker.cpp
+++ b/aegisub/src/dialog_colorpicker.cpp
@@ -247,7 +247,7 @@ public:
 	~DialogColorPicker();
 
 	void SetColor(agi::Color new_color);
-	agi::Color GetColor();
+	void AddColorToRecent();
 };
 
 static const int spectrum_horz_vert_arrow_size = 4;
@@ -589,6 +589,8 @@ bool GetColorFromUser(wxWindow* parent, agi::Color original, std::function<void
 	bool ok = dialog.ShowModal() == wxID_OK;
 	if (!ok)
 		callback(original);
+	else
+		dialog.AddColorToRecent();
 	return ok;
 }
 
@@ -805,12 +807,10 @@ void DialogColorPicker::SetColor(agi::Color new_color)
 	UpdateFromRGB();
 }
 
-/// @brief Get the currently selected color
-agi::Color DialogColorPicker::GetColor()
+void DialogColorPicker::AddColorToRecent()
 {
 	recent_box->AddColor(cur_color);
 	OPT_SET("Tool/Colour Picker/Recent Colours")->SetListColor(recent_box->Save());
-	return cur_color;
 }
 
 static void change_value(wxSpinCtrl *ctrl, int value)