Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid warning about shadowing

This commit is contained in:
Martchus 2022-10-30 21:26:12 +01:00
parent 777c804fe1
commit 4357c4b5f6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tray/application/main.cpp
View File

@ -170,10 +170,10 @@ int runApplication(int argc, const char *const *argv)
connectionArg.setRequiredValueCount(Argument::varValueCount);
auto configPathArg = ConfigValueArgument("config-dir-path", '\0', "specifies the path to the configuration directory", { "path" });
configPathArg.setEnvironmentVariable(PROJECT_VARNAME_UPPER "_CONFIG_DIR");
auto singleInstance = Argument("single-instance", '\0', "does nothing if a tray icon is already shown");
auto singleInstanceArg = Argument("single-instance", '\0', "does nothing if a tray icon is already shown");
auto newInstanceArg = Argument("new-instance", '\0', "disable the usual single-process behavior");
auto &widgetsGuiArg = qtConfigArgs.qtWidgetsGuiArg();
widgetsGuiArg.addSubArguments({ &windowedArg, &showWebUiArg, &triggerArg, &waitForTrayArg, &connectionArg, &configPathArg, &singleInstance,
widgetsGuiArg.addSubArguments({ &windowedArg, &showWebUiArg, &triggerArg, &waitForTrayArg, &connectionArg, &configPathArg, &singleInstanceArg,
&newInstanceArg, &showWizardArg, &assumeFirstLaunchArg, &wipArg });
#ifdef SYNCTHINGTRAY_USE_LIBSYNCTHING
auto cliArg = OperationArgument("cli", 'c', "run Syncthing's CLI");
@ -259,7 +259,7 @@ int runApplication(int argc, const char *const *argv)
}
// don't create a new instance if --single-instance has been specified
if (!firstInstance && singleInstance.isPresent()) {
if (!firstInstance && singleInstanceArg.isPresent()) {
return 0;
}