diff --git a/src/blackchocobo.cpp b/src/blackchocobo.cpp index 18562d3f..e43add49 100644 --- a/src/blackchocobo.cpp +++ b/src/blackchocobo.cpp @@ -1,5 +1,5 @@ /****************************************************************************/ -// copyright 2010-2022 Chris Rizzitello // +// copyright 2010-2023 Chris Rizzitello // // // // This file is part of Black Chocobo. // // // @@ -1626,7 +1626,10 @@ void BlackChocobo::update_hexEditor_PSXInfo(void) { load = true; + disconnect(saveIcon, nullptr, nullptr, nullptr); saveIcon->setAll(ff7->slotIcon(s)); + connect(saveIcon, &SaveIcon::nextIcon, ui->lblPsxIcon, &QLabel::setPixmap); + ui->comboSlotNumber->setCurrentIndex(ff7->region(s).mid(ff7->region(s).lastIndexOf(QStringLiteral("S")) + 1, 2).toInt() - 1); if(ff7->region(s).contains(QStringLiteral("BASCUS-94163"))) ui->comboSlotRegion->setCurrentIndex(0); diff --git a/src/dialogs/bcdialog.cpp b/src/dialogs/bcdialog.cpp index fb063e91..a4fff020 100644 --- a/src/dialogs/bcdialog.cpp +++ b/src/dialogs/bcdialog.cpp @@ -1,5 +1,5 @@ /****************************************************************************/ -// copyright 2020 Chris Rizzitello // +// copyright 2020 - 2023 Chris Rizzitello // // // // This file is part of Black Chocobo. // // // @@ -286,8 +286,8 @@ QFileDialog* BCDialog::getFileDialog(QWidget *parent, const QString &title, cons const auto drives = QStorageInfo::mountedVolumes().toList(); for (const auto &drive : drives) { bool chksubs = QFile::exists("/.flatpak-info") ? drive.subvolume().isEmpty() : true; - if (drive.fileSystemType() != "tmpfs" && drive.displayName() != "/boot" && drive.displayName() != "/home" && drive.isValid() && chksubs) - sideBarUrls.append(QUrl::fromLocalFile(drive.displayName())); + if (drive.fileSystemType() != "tmpfs" && drive.displayName() != "/boot" && drive.rootPath() != "/home" && drive.isValid() && chksubs) + sideBarUrls.append(QUrl::fromLocalFile(drive.rootPath())); } #else const QFileInfoList drives = QDir::drives(); diff --git a/src/dialogs/bcdialog.h b/src/dialogs/bcdialog.h index d1638d01..a8091adc 100644 --- a/src/dialogs/bcdialog.h +++ b/src/dialogs/bcdialog.h @@ -1,5 +1,5 @@ /****************************************************************************/ -// copyright 2022 Chris Rizzitello // +// copyright 2022 - 2023 Chris Rizzitello // // // // This file is part of Black Chocobo. // // //