History

new --scripts switch overrides default scripts location

David Kelly committed 9 years ago

Commit ff5b37c1 parent 34edd958 files · +81 −45Browse files

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

Unified · Split

interface/src/Menu.cpp+2−2
@@ -300,7 +300,7 @@ Menu::Menu() { · 299 unmodified lines
300300 // Settings > Avatar...
301301 action = addActionToQMenuAndActionHash(settingsMenu, "Avatar...");
302302 connect(action, &QAction::triggered, [] {
303− qApp->showDialog(QString("hifi/dialogs/AvatarPreferencesDialog.qml"),
303+ qApp->showDialog(QString("hifi/dialogs/AvatarPreferencesDialog.qml"),
304304 QString("../../hifi/tablet/TabletAvatarPreferences.qml"), "AvatarPreferencesDialog");
305305 });
306306
@@ -626,7 +626,7 @@ Menu::Menu() { · 319 unmodified lines
626626 action = addActionToQMenuAndActionHash(audioDebugMenu, "Stats...");
627627 connect(action, &QAction::triggered, [] {
628628 auto scriptEngines = DependencyManager::get<ScriptEngines>();
629− QUrl defaultScriptsLoc = defaultScriptsLocation();
629+ QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
630630 defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/audio/stats.js");
631631 scriptEngines->loadScript(defaultScriptsLoc.toString());
632632 });