History

Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity

Atlante45 committed 12 years ago

Commit ff8694d2 parents 5e2ad71 146cd2b37 files · +786 −102Browse files

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

Unified · Split

interface/src/Application.cpp+3−2
@@ -3656,8 +3656,9 @@ void Application::stopAllScripts(bool restart) { · 3655 unmodified lines
36563656 }
36573657
36583658 void Application::stopScript(const QString &scriptName) {
3659− if (_scriptEnginesHash.contains(scriptName)) {
3660− _scriptEnginesHash.value(scriptName)->stop();
3659+ const QString& scriptURLString = QUrl(scriptName).toString();
3660+ if (_scriptEnginesHash.contains(scriptURLString)) {
3661+ _scriptEnginesHash.value(scriptURLString)->stop();
36613662 qDebug() << "stopping script..." << scriptName;
36623663 }
36633664 }

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