History

keep signature for askToLoadScript

Stephen Birarda committed 10 years ago

Commit 5bce9241 parent 216e47b2 files · +6 −5Browse files

Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all

Unified · Split

interface/src/Application.cpp+5−4
@@ -4804,16 +4804,17 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 4803 unmodified lines
48044804 }
48054805
48064806
4807−bool Application::askToLoadScript(QString scriptFilenameOrURL) {
4807+bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
48084808 QMessageBox::StandardButton reply;
48094809
48104810 static const QString MARKETPLACE_SCRIPT_URL_HOSTNAME_SUFFIX = "mpassets.highfidelity.com";
48114811
4812− if (scriptFilenameOrURL.contains(MARKETPLACE_SCRIPT_URL_HOSTNAME_SUFFIX)) {
4813− scriptFilenameOrURL = scriptFilenameOrURL.mid(scriptFilenameOrURL.lastIndexOf('/') + 1);
4812+ QString shortName = scriptFilenameOrURL;
4813+ if (shortName.contains(MARKETPLACE_SCRIPT_URL_HOSTNAME_SUFFIX)) {
4814+ shortName = shortName.mid(shortName.lastIndexOf('/') + 1);
48144815 }
48154816
4816− QString message = "Would you like to run this script:\n" + scriptFilenameOrURL;
4817+ QString message = "Would you like to run this script:\n" + shortName;
48174818
48184819 reply = OffscreenUi::question(getWindow(), "Run Script", message, QMessageBox::Yes | QMessageBox::No);
48194820

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t