Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #10017 from JosJuice/qt-gecko-notes-lf
DolphinQt: Don't add trailing newline to Gecko notes
  • Loading branch information
lioncash committed Aug 13, 2021
2 parents c43f451 + 7eabd9e commit e2ccad7
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions Source/Core/DolphinQt/Config/CheatCodeEditor.cpp
Expand Up @@ -11,6 +11,8 @@
#include <QStringList>
#include <QTextEdit>

#include "Common/StringUtil.h"

#include "Core/ARDecrypt.h"
#include "Core/ActionReplay.h"
#include "Core/GeckoCodeConfig.h"
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit e2ccad7

Please sign in to comment.