From 9a323a9a8d873588302dfea0f22aec0abb073dc1 Mon Sep 17 00:00:00 2001 From: refractionpcsx2 Date: Tue, 21 Jun 2022 19:20:18 +0100 Subject: [PATCH] GUI: Only add extension to new memcards on save --- pcsx2-qt/Settings/CreateMemoryCardDialog.cpp | 28 +++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pcsx2-qt/Settings/CreateMemoryCardDialog.cpp b/pcsx2-qt/Settings/CreateMemoryCardDialog.cpp index dc5494fd49..60150ea59d 100644 --- a/pcsx2-qt/Settings/CreateMemoryCardDialog.cpp +++ b/pcsx2-qt/Settings/CreateMemoryCardDialog.cpp @@ -60,20 +60,16 @@ CreateMemoryCardDialog::~CreateMemoryCardDialog() = default; void CreateMemoryCardDialog::nameTextChanged() { - const QString controlName(m_ui.name->text()); + QString controlName(m_ui.name->text()); const int cursorPos = m_ui.name->cursorPosition(); - QString nameWithoutExtension; - if (controlName.endsWith(QStringLiteral(".ps2"))) - nameWithoutExtension = controlName.left(controlName.size() - 4); - else - nameWithoutExtension = controlName; + controlName.replace(".", ""); QSignalBlocker sb(m_ui.name); - if (nameWithoutExtension.isEmpty()) + if (controlName.isEmpty()) m_ui.name->setText(QString()); else - m_ui.name->setText(nameWithoutExtension + QStringLiteral(".ps2")); + m_ui.name->setText(controlName); m_ui.name->setCursorPosition(cursorPos); updateState(); @@ -109,8 +105,20 @@ void CreateMemoryCardDialog::updateState() void CreateMemoryCardDialog::createCard() { - const QString name(m_ui.name->text()); - const std::string nameStr(name.toStdString()); + QString name(m_ui.name->text()); + std::string nameStr; + + if (m_fileType == MemoryCardFileType::PS1) + { + name += QStringLiteral(".mcr"); + } + else + { + name += QStringLiteral(".ps2"); + } + + nameStr = name.toStdString(); + if (FileMcd_GetCardInfo(nameStr).has_value()) { QMessageBox::critical(this, tr("Create Memory Card"),