Skip to content

Commit 84cb2f6

Browse files
committed
internal: fix undef/null errors
1 parent e70cb28 commit 84cb2f6

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

components/filedialog/FileDialog.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ LazyLoader {
3737

3838
readonly property bool selectionValid: {
3939
const file = folderContents.currentItem?.modelData;
40-
return file && !file.isDir && (filters.includes("*") || filters.includes(file.suffix));
40+
return (file && !file.isDir && (filters.includes("*") || filters.includes(file.suffix))) ?? false;
4141
}
4242

4343
function accepted(path: string): void {

components/filedialog/FolderContents.qml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,18 @@ Item {
142142

143143
implicitSize: Sizes.itemWidth - Appearance.padding.normal * 2
144144
source: {
145-
if (item.modelData.isImage)
146-
return Qt.resolvedUrl(item.modelData.path);
145+
const file = item.modelData;
146+
if (!file)
147+
return Quickshell.iconPath("application-x-zerosize");
147148

148-
if (!item.modelData.isDir)
149-
return Quickshell.iconPath(item.modelData.mimeType.replace("/", "-"), "application-x-zerosize");
149+
if (file.isImage)
150+
return Qt.resolvedUrl(file.path);
150151

151-
const name = item.modelData.name;
152-
if (root.dialog.cwd.length === 1 && ["Desktop", "Documents", "Downloads", "Music", "Pictures", "Public", "Templates", "Videos"].includes(name))
153-
return Quickshell.iconPath(`folder-${name.toLowerCase()}`);
152+
if (!file.isDir)
153+
return Quickshell.iconPath(file.mimeType.replace("/", "-"), "application-x-zerosize");
154+
155+
if (root.dialog.cwd.length === 1 && ["Desktop", "Documents", "Downloads", "Music", "Pictures", "Public", "Templates", "Videos"].includes(file.name))
156+
return Quickshell.iconPath(`folder-${file.name.toLowerCase()}`);
154157

155158
return Quickshell.iconPath("inode-directory");
156159
}
@@ -166,7 +169,7 @@ Item {
166169
anchors.margins: Appearance.padding.normal
167170

168171
horizontalAlignment: Text.AlignHCenter
169-
text: item.modelData.name
172+
text: item.modelData?.name ?? ""
170173
elide: item.GridView.isCurrentItem ? Text.ElideNone : Text.ElideRight
171174
wrapMode: item.GridView.isCurrentItem ? Text.WrapAtWordBoundaryOrAnywhere : Text.NoWrap
172175
}

0 commit comments

Comments
 (0)