diff options
| author | ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com> | 2022-11-15 10:05:04 +0200 |
|---|---|---|
| committer | ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com> | 2022-11-15 10:05:04 +0200 |
| commit | ba46ff6692beb49c32260a962894c53996c32ccf (patch) | |
| tree | 4df8660508f0e93587f9d0fb221bed960f0d7b31 /launcher/icons | |
| parent | cca052ccc9d644c84384ceefe97bbce45381a9e2 (diff) | |
| parent | cedc7754d96e4c53d50bcce2b2a0f139b840f3d0 (diff) | |
| download | PrismLauncher-ba46ff6692beb49c32260a962894c53996c32ccf.tar.gz PrismLauncher-ba46ff6692beb49c32260a962894c53996c32ccf.tar.bz2 PrismLauncher-ba46ff6692beb49c32260a962894c53996c32ccf.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/instance-shortcuts
Diffstat (limited to 'launcher/icons')
| -rw-r--r-- | launcher/icons/IconList.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/launcher/icons/IconList.cpp b/launcher/icons/IconList.cpp index 3a223d1b..01043ad2 100644 --- a/launcher/icons/IconList.cpp +++ b/launcher/icons/IconList.cpp @@ -242,7 +242,7 @@ Qt::DropActions IconList::supportedDropActions() const return Qt::CopyAction; } -bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) +bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, [[maybe_unused]] int row, [[maybe_unused]] int column, [[maybe_unused]] const QModelIndex &parent) { if (action == Qt::IgnoreAction) return true; @@ -302,7 +302,7 @@ QVariant IconList::data(const QModelIndex &index, int role) const int IconList::rowCount(const QModelIndex &parent) const { - return icons.size(); + return parent.isValid() ? 0 : icons.size(); } void IconList::installIcons(const QStringList &iconFiles) |