Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

General bug fixes #60

Merged
merged 2 commits into from
Mar 7, 2023
+8 −5
Merged

General bug fixes #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8889288
Hex Editor Play Psx Icons animation
sithlord48 Mar 6, 2023
30e2e24
use rootPath in place of displayName for drives
sithlord48 Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/blackchocobo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************/
// copyright 2010-2022 Chris Rizzitello <sithlord48@gmail.com> //
// copyright 2010-2023 Chris Rizzitello <sithlord48@gmail.com> //
// //
// This file is part of Black Chocobo. //
// //
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/dialogs/bcdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************/
// copyright 2020 Chris Rizzitello <sithlord48@gmail.com> //
// copyright 2020 - 2023 Chris Rizzitello <sithlord48@gmail.com> //
// //
// This file is part of Black Chocobo. //
// //
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/dialogs/bcdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************/
// copyright 2022 Chris Rizzitello <sithlord48@gmail.com> //
// copyright 2022 - 2023 Chris Rizzitello <sithlord48@gmail.com> //
// //
// This file is part of Black Chocobo. //
// //
Expand Down