Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -859,11 +859,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 858 unmodified lines | ||
| 859 | 859 | } |
| 860 | 860 | ResourceCache::setRequestLimit(concurrentDownloads); |
| 861 | 861 | |
| 862 | − // perhaps override the avatar url. We test later for validity, so | |
| 863 | − // no need to do so here. If someone specifies both --avatarURL | |
| 864 | − // and --replaceAvatarURL, the replaceAvatarURL wins. | |
| 862 | + // perhaps override the avatar url. Since we will test later for validity | |
| 863 | + // we don't need to do so here. | |
| 865 | 864 | QString avatarURL = getCmdOption(argc, constArgv, "--avatarURL"); |
| 866 | 865 | _avatarOverrideUrl = QUrl::fromUserInput(avatarURL); |
| 866 | + | |
| 867 | + // If someone specifies both --avatarURL and --replaceAvatarURL, | |
| 868 | + // the replaceAvatarURL wins. So only set the _overrideUrl if this | |
| 869 | + // does have a non-empty string. | |
| 867 | 870 | QString replaceURL = getCmdOption(argc, constArgv, "--replaceAvatarURL"); |
| 868 | 871 | if (!replaceURL.isEmpty()) { |
| 869 | 872 | _avatarOverrideUrl = QUrl::fromUserInput(replaceURL); |