Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 23:55:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6984 from huffman/fix-edit-import-cancel

Browse source 
Fix 'Import Entities' causing error when cancelling
This commit is contained in:
Seth Alves 2016-02-01 07:04:36 -08:00
commit 6927f9f503
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/edit.js
View file

@ -1277,9 +1277,12 @@ function handeMenuEvent(menuItem) {
} }
} else if (menuItem == "Import Entities" || menuItem == "Import Entities from URL") { } else if (menuItem == "Import Entities" || menuItem == "Import Entities from URL") {
var importURL; var importURL = null;
if (menuItem == "Import Entities") { if (menuItem == "Import Entities") {
importURL = "file:///" + Window.browse("Select models to import", "", "*.json"); var fullPath = Window.browse("Select models to import", "", "*.json");
if (fullPath) {
importURL = "file:///" + fullPath;
}
} else { } else {
importURL = Window.prompt("URL of SVO to import", ""); importURL = Window.prompt("URL of SVO to import", "");
} }