Merge pull request #10017 from JosJuice/qt-gecko-notes-lf

DolphinQt: Don't add trailing newline to Gecko notes
This commit is contained in:
Mai M 2021-08-13 13:21:07 -04:00 committed by GitHub
commit e2ccad7f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions

View File

@ -11,6 +11,8 @@
#include <QStringList>
#include <QTextEdit>
#include "Common/StringUtil.h"
#include "Core/ARDecrypt.h"
#include "Core/ActionReplay.h"
#include "Core/GeckoCodeConfig.h"
@ -277,22 +279,16 @@ bool CheatCodeEditor::AcceptGecko()
if (entries.empty())
{
ModalMessageBox::critical(this, tr("Error"),
tr("The resulting decrypted AR code doesn't contain any lines."));
ModalMessageBox::critical(this, tr("Error"), tr("This Gecko code doesn't contain any lines."));
return false;
}
m_gecko_code->name = m_name_edit->text().toStdString();
m_gecko_code->creator = m_creator_edit->text().toStdString();
m_gecko_code->codes = std::move(entries);
m_gecko_code->notes = SplitString(m_notes_edit->toPlainText().toStdString(), '\n');
m_gecko_code->user_defined = true;
std::vector<std::string> note_lines;
for (const QString& line : m_notes_edit->toPlainText().split(QLatin1Char{'\n'}))
note_lines.push_back(line.toStdString());
m_gecko_code->notes = std::move(note_lines);
return true;
}