From 58fce5699251e4b0e7353443988497fb30960188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 20 Aug 2022 11:58:00 +0200 Subject: [PATCH] Fix --disable-displays and --disable-inputs arguments --- interface/src/Application.cpp | 5 +++-- interface/src/main.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index c74ec0a397..896b4f25d0 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5,6 +5,7 @@ // Created by Andrzej Kapolka on 5/10/13. // Copyright 2013 High Fidelity, Inc. // Copyright 2020 Vircadia contributors. +// Copyright 2022 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -8793,13 +8794,13 @@ void Application::initPlugins(const QCommandLineParser& parser) { } if (parser.isSet("disable-displays")) { - auto disabledDisplays = parser.value("disableDisplays").split(',', Qt::SkipEmptyParts); + auto disabledDisplays = parser.value("disable-displays").split(',', Qt::SkipEmptyParts); qInfo() << "Disabling following display plugins:" << disabledDisplays; PluginManager::getInstance()->disableDisplays(disabledDisplays); } if (parser.isSet("disable-inputs")) { - auto disabledInputs = parser.value("disableInputs").split(',', Qt::SkipEmptyParts); + auto disabledInputs = parser.value("disable-inputs").split(',', Qt::SkipEmptyParts); qInfo() << "Disabling following input plugins:" << disabledInputs; PluginManager::getInstance()->disableInputs(disabledInputs); } diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 0bbabfce4b..04613485b7 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -3,6 +3,7 @@ // interface/src // // Copyright 2013 High Fidelity, Inc. +// Copyright 2022 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -125,12 +126,12 @@ int main(int argc, const char* argv[]) { ); QCommandLineOption disableDisplaysOption( "disable-displays", - "Displays to disable.", + "Displays to disable. Valid options include \"OpenVR (Vive)\" and \"Oculus Rift\"", "string" ); QCommandLineOption disableInputsOption( "disable-inputs", - "Inputs to disable.", + "Inputs to disable. Valid options include \"OpenVR (Vive)\" and \"Oculus Rift\"", "string" ); QCommandLineOption suppressSettingsResetOption(