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
33953395 }
33963396
33973397 void Application::clearScriptsBeforeRunning() {
3398− // clears all scripts from the settings
3399− SettingHandles::SettingHandle<QVariant>(SETTINGS_KEY).remove();
3398+ // clears all scripts from the settingsSettings settings;
3399+ Settings settings;
3400+ settings.beginWriteArray(SETTINGS_KEY);
3401+ settings.remove("");
34003402 }
34013403
34023404 void Application::saveScripts() {
3403− QStringList runningScripts = getRunningScripts();
3404− if (runningScripts.isEmpty()) {
3405− return;
3406− }
3407−
34083405 // Saves all currently running user-loaded scripts
34093406 Settings settings;
34103407 settings.beginWriteArray(SETTINGS_KEY);
3408+ settings.remove("");
3409+
3410+ QStringList runningScripts = getRunningScripts();
34113411 int i = 0;
34123412 for (auto it = runningScripts.begin(); it != runningScripts.end(); ++it) {
34133413 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