diff --git a/src/duckstation-qt/memorycardeditordialog.cpp b/src/duckstation-qt/memorycardeditordialog.cpp index 731de6288..be2676ee4 100644 --- a/src/duckstation-qt/memorycardeditordialog.cpp +++ b/src/duckstation-qt/memorycardeditordialog.cpp @@ -33,7 +33,7 @@ MemoryCardEditorDialog::~MemoryCardEditorDialog() = default; bool MemoryCardEditorDialog::setCardA(const QString& path) { - const int index = m_ui.cardAPath->findData(QVariant(path)); + const int index = m_ui.cardAPath->findData(QVariant(QDir::toNativeSeparators(path))); if (index < 0) return false; @@ -43,7 +43,7 @@ bool MemoryCardEditorDialog::setCardA(const QString& path) bool MemoryCardEditorDialog::setCardB(const QString& path) { - const int index = m_ui.cardBPath->findData(QVariant(path)); + const int index = m_ui.cardBPath->findData(QVariant(QDir::toNativeSeparators(path))); if (index < 0) return false; @@ -114,7 +114,8 @@ void MemoryCardEditorDialog::loadCardFromComboBox(Card* card, int index) QString filename; if (index == 1) { - filename = QFileDialog::getOpenFileName(this, tr("Select Memory Card"), QString(), tr(MEMORY_CARD_IMAGE_FILTER)); + filename = QDir::toNativeSeparators( + QFileDialog::getOpenFileName(this, tr("Select Memory Card"), QString(), tr(MEMORY_CARD_IMAGE_FILTER))); if (!filename.isEmpty()) { // add to combo box @@ -238,8 +239,8 @@ void MemoryCardEditorDialog::newCard(Card* card) { promptForSave(card); - QString filename = - QFileDialog::getSaveFileName(this, tr("Select Memory Card"), QString(), tr(MEMORY_CARD_IMAGE_FILTER)); + QString filename = QDir::toNativeSeparators( + QFileDialog::getSaveFileName(this, tr("Select Memory Card"), QString(), tr(MEMORY_CARD_IMAGE_FILTER))); if (filename.isEmpty()) return; @@ -264,8 +265,8 @@ void MemoryCardEditorDialog::openCard(Card* card) { promptForSave(card); - QString filename = - QFileDialog::getOpenFileName(this, tr("Select Memory Card"), QString(), tr(MEMORY_CARD_IMAGE_FILTER)); + QString filename = QDir::toNativeSeparators( + QFileDialog::getOpenFileName(this, tr("Select Memory Card"), QString(), tr(MEMORY_CARD_IMAGE_FILTER))); if (filename.isEmpty()) return; diff --git a/src/duckstation-qt/memorycardsettingswidget.cpp b/src/duckstation-qt/memorycardsettingswidget.cpp index 6df775b40..8ab9140a2 100644 --- a/src/duckstation-qt/memorycardsettingswidget.cpp +++ b/src/duckstation-qt/memorycardsettingswidget.cpp @@ -11,7 +11,8 @@ #include #include -static constexpr char MEMORY_CARD_IMAGE_FILTER[] = QT_TRANSLATE_NOOP("MemoryCardSettingsWidget", "All Memory Card Types (*.mcd *.mcr *.mc)"); +static constexpr char MEMORY_CARD_IMAGE_FILTER[] = + QT_TRANSLATE_NOOP("MemoryCardSettingsWidget", "All Memory Card Types (*.mcd *.mcr *.mc)"); MemoryCardSettingsWidget::MemoryCardSettingsWidget(QtHostInterface* host_interface, QWidget* parent, SettingsDialog* dialog) @@ -104,8 +105,8 @@ void MemoryCardSettingsWidget::createPortSettingsUi(SettingsDialog* dialog, int void MemoryCardSettingsWidget::onBrowseMemoryCardPathClicked(int index) { - QString path = - QFileDialog::getOpenFileName(this, tr("Select path to memory card image"), QString(), tr(MEMORY_CARD_IMAGE_FILTER)); + QString path = QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Select path to memory card image"), + QString(), tr(MEMORY_CARD_IMAGE_FILTER))); if (path.isEmpty()) return;