Merge pull request #10440 from davidkelly/dk/fixSettingsDialog

Fix for multiple settings dialogs
This commit is contained in:
David Kelly 2017-05-11 08:11:16 -07:00 committed by GitHub
commit 0ea5bf7834

View file

@ -111,7 +111,7 @@ function onMessage(message) {
case 'openSettings':
if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", false))
|| (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "General Preferences");
Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "GeneralPreferencesDialog");
} else {
tablet.loadQMLOnTop("TabletGeneralPreferences.qml");
}