Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 09:31:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12684 from vladest/assetserver_wrong_dialog

Browse source 
Fix invalid message if cancel adding asset to AssetServer
This commit is contained in:
John Conklin II 2018-04-02 15:28:46 -07:00 committed by GitHub
commit 9dcef996c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/scripting/AssetMappingsScriptingInterface.cpp
View file

@ -80,7 +80,7 @@ void AssetMappingsScriptingInterface::uploadFile(QString path, QString mapping,
auto result = offscreenUi->inputDialog(OffscreenUi::ICON_INFORMATION, "Specify Asset Path", auto result = offscreenUi->inputDialog(OffscreenUi::ICON_INFORMATION, "Specify Asset Path",
dropEvent ? dropHelpText : helpText, mapping); dropEvent ? dropHelpText : helpText, mapping);
if (!result.isValid()) { if (!result.isValid() || result.toString() == "") {
completedCallback.call({ -1 }); completedCallback.call({ -1 });
return; return;
} }