Skip to content

Commit

Permalink
Merge pull request #1809 from alicevision/dev/lv/fixCrashNonASCIIPath
Browse files Browse the repository at this point in the history
Fix crash when importing images with non-ascii characters in their filepath
  • Loading branch information
fabiencastan authored Nov 2, 2022
2 parents 7593254 + ef62d70 commit 3822bc8
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions meshroom/ui/qml/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -310,14 +310,13 @@ ApplicationWindow {
}

FileDialog {
id: importFilesDialog
id: importImagesDialog
title: "Import Images"
selectExisting: true
selectMultiple: true
nameFilters: []
onAccepted: {
console.warn("importFilesDialog fileUrls: " + importFilesDialog.fileUrls)
_reconstruction.importImagesUrls(importFilesDialog.fileUrls)
_reconstruction.importImagesUrls(importImagesDialog.fileUrls)
}
}

Expand Down Expand Up @@ -577,17 +576,17 @@ ApplicationWindow {
}
}
Action {
id: importActionItem
id: importImagesAction
text: "Import Images"
shortcut: "Ctrl+I"
onTriggered: {
initFileDialogFolder(importFilesDialog);
importFilesDialog.open();
initFileDialogFolder(importImagesDialog);
importImagesDialog.open();
}
}

Action {
id: clearActionItem
id: clearImagesAction
text: "Clear Images"
onTriggered: {
//Loop through all the camera inits
Expand Down

0 comments on commit 3822bc8

Please sign in to comment.