diff options
| author | Stenzek <stenzek@users.noreply.github.com> | 2018-02-03 00:56:55 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 00:56:55 +1000 |
| commit | cf5bf3899f65279e142632e5eca4154ab8377545 (patch) | |
| tree | 566fecc264b976069a08ae0f724ce3bf7a798232 /Source/Core/DolphinQt2/Config/FilesystemWidget.cpp | |
| parent | e20eac72f4fd29da7df6db80bc82191eebd9f1b3 (diff) | |
| parent | 8a612bf285ce9513960c212b18c688a7d38991f6 (diff) | |
Merge pull request #6345 from spycrab/qt_fix_fsw
Qt/FileystemWidget: Fix crash when right-clicking GC disc
Diffstat (limited to 'Source/Core/DolphinQt2/Config/FilesystemWidget.cpp')
| -rw-r--r-- | Source/Core/DolphinQt2/Config/FilesystemWidget.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp b/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp index 4da2dd11e0..ccbb2b28b1 100644 --- a/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp +++ b/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp @@ -148,11 +148,13 @@ void FilesystemWidget::ShowContextMenu(const QPoint&) QMenu* menu = new QMenu(this); - DiscIO::Partition partition = GetPartitionFromID(item->data(ENTRY_PARTITION).toInt()); - QString path = item->data(ENTRY_NAME).toString(); - EntryType type = item->data(ENTRY_TYPE).value<EntryType>(); + DiscIO::Partition partition = type == EntryType::Disc ? + DiscIO::PARTITION_NONE : + GetPartitionFromID(item->data(ENTRY_PARTITION).toInt()); + QString path = item->data(ENTRY_NAME).toString(); + if ((type == EntryType::Disc && m_volume->GetPartitions().empty()) || type == EntryType::Partition) { |