History

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

Andrzej Kapolka committed 12 years ago

Commit 8efc4d52 parents d80b52d 4fc54442 files · +27 −5Browse files

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

Unified · Split

interface/src/Application.cpp+4−2
@@ -4206,7 +4206,9 @@ void Application::reloadAllScripts() { · 4205 unmodified lines
4206 scriptAction->activate(QAction::Trigger);4206 scriptAction->activate(QAction::Trigger);
4207 qDebug() << "stopping script..." << scriptAction->text();4207 qDebug() << "stopping script..." << scriptAction->text();
4208 }4208 }
4209 _activeScripts.clear();4209
4210 // NOTE: we don't need to clear the _activeScripts list because that is handled on script shutdown.
4211
4210 foreach (QString scriptName, reloadList){4212 foreach (QString scriptName, reloadList){
4211 qDebug() << "reloading script..." << scriptName;4213 qDebug() << "reloading script..." << scriptName;
4212 loadScript(scriptName);4214 loadScript(scriptName);
@@ -4214,7 +4216,7 @@ void Application::reloadAllScripts() { · 1 unmodified line
4214}4216}
4215 4217
4216void Application::removeScriptName(const QString& fileNameString) {4218void Application::removeScriptName(const QString& fileNameString) {
4217 _activeScripts.removeOne(fileNameString);4219 _activeScripts.removeOne(fileNameString);
4218}4220}
4219 4221
4220void Application::loadScript(const QString& fileNameString) {4222void Application::loadScript(const QString& fileNameString) {

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