From 92887b53cfe5df42e3a5b16048fbb24345936dc3 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 8 Aug 2013 20:36:12 -0700
Subject: [PATCH] Fix crash when pasting styles in the styles manager

---
 aegisub/src/dialog_style_manager.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/aegisub/src/dialog_style_manager.cpp b/aegisub/src/dialog_style_manager.cpp
index d0e190eb7..4eb5e783e 100644
--- a/aegisub/src/dialog_style_manager.cpp
+++ b/aegisub/src/dialog_style_manager.cpp
@@ -55,11 +55,11 @@
 #include <libaegisub/fs.h>
 #include <libaegisub/path.h>
 #include <libaegisub/of_type_adaptor.h>
+#include <libaegisub/split.h>
 #include <libaegisub/util.h>
 
 #include <algorithm>
 #include <boost/algorithm/string/trim.hpp>
-#include <boost/tokenizer.hpp>
 #include <functional>
 
 #include <wx/bmpbuttn.h>
@@ -126,11 +126,12 @@ std::string unique_name(Func name_checker, std::string const& source_name) {
 
 template<class Func1, class Func2>
 void add_styles(Func1 name_checker, Func2 style_adder) {
-	boost::char_separator<char> sep("\n");
-	for (auto tok : boost::tokenizer<boost::char_separator<char>>(GetClipboard(), sep)) {
-		boost::trim(tok);
+	auto cb = GetClipboard();
+	for (auto tok : agi::Split(cb, '\n')) {
+		tok = boost::trim_copy(tok);
+		if (tok.empty()) continue;
 		try {
-			AssStyle *s = new AssStyle(tok);
+			AssStyle *s = new AssStyle(agi::str(tok));
 			s->name = unique_name(name_checker, s->name);
 			style_adder(s);
 		}