History

Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter

Seth Alves committed 11 years ago

Commit 5c9d64c2 parents 620efb2 53534ce2 files · +7 −8Browse files

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

Unified · Split

interface/src/Application.cpp+7−7
@@ -3395,19 +3395,19 @@ void Application::loadScripts() { · 3394 unmodified lines
3395}3395}
3396 3396
3397void Application::clearScriptsBeforeRunning() {3397void Application::clearScriptsBeforeRunning() {
3398 // clears all scripts from the settings3398 // clears all scripts from the settingsSettings settings;
3399 SettingHandles::SettingHandle<QVariant>(SETTINGS_KEY).remove();3399 Settings settings;
3400 settings.beginWriteArray(SETTINGS_KEY);
3401 settings.remove("");
3400}3402}
3401 3403
3402void Application::saveScripts() {3404void Application::saveScripts() {
3403 QStringList runningScripts = getRunningScripts();
3404 if (runningScripts.isEmpty()) {
3405 return;
3406 }
3407
3408 // Saves all currently running user-loaded scripts3405 // Saves all currently running user-loaded scripts
3409 Settings settings;3406 Settings settings;
3410 settings.beginWriteArray(SETTINGS_KEY);3407 settings.beginWriteArray(SETTINGS_KEY);
3408 settings.remove("");
3409
3410 QStringList runningScripts = getRunningScripts();
3411 int i = 0;3411 int i = 0;
3412 for (auto it = runningScripts.begin(); it != runningScripts.end(); ++it) {3412 for (auto it = runningScripts.begin(); it != runningScripts.end(); ++it) {
3413 if (getScriptEngine(*it)->isUserLoaded()) {3413 if (getScriptEngine(*it)->isUserLoaded()) {

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