From 5991f0ca292697076628c73db042d3db21b6a956 Mon Sep 17 00:00:00 2001 From: gir489 <100792176+gir489returns@users.noreply.github.com> Date: Fri, 25 Aug 2023 02:54:24 -0400 Subject: [PATCH] Handle CR/LF characters better for Import From Clipboard. (#2021) --- src/views/settings/view_stat_editor.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/views/settings/view_stat_editor.cpp b/src/views/settings/view_stat_editor.cpp index b0313d3c..827838a0 100644 --- a/src/views/settings/view_stat_editor.cpp +++ b/src/views/settings/view_stat_editor.cpp @@ -279,7 +279,13 @@ namespace big ImGui::Text("Example:\n$MPX_CHAR_NAME\n5:name\n$MPX_DEFAULT_STATS_SET\n1:0"); components::button("Import From Clipboard", [] { std::string clipboard_text = ImGui::GetClipboardText(); - std::vector lines = split(clipboard_text, '\n'); + std::vector lines; + std::string line; + std::istringstream stream(clipboard_text); + while (std::getline(stream, line)) + { + lines.push_back(line); + } if (!lines.size() || lines.size() % 2) return; for (size_t i = 0; i < lines.size(); i += 2) @@ -371,8 +377,14 @@ namespace big ImGui::Text("0:Int\n1:Bool"); ImGui::Text("Example:\n31786\n0:123\n31786 32786\n1:1"); components::button("Import From Clipboard", [] { - std::string clipboard_text = ImGui::GetClipboardText(); - std::vector lines = split(clipboard_text, '\n'); + std::string clipboard_text = ImGui::GetClipboardText(); + std::vector lines; + std::string line; + std::istringstream stream(clipboard_text); + while (std::getline(stream, line)) + { + lines.push_back(line); + } if (!lines.size() || lines.size() % 2) return; for (size_t i = 0; i < lines.size(); i += 2)