Merge fixes

This commit is contained in:
vladest 2018-04-19 21:04:11 +02:00
parent ab1a89a6f9
commit b191ad866f

View file

@ -7543,10 +7543,10 @@ void Application::updateDisplayMode() {
standard.insert(std::end(standard), std::begin(advanced), std::end(advanced));
standard.insert(std::end(standard), std::begin(developer), std::end(developer));
int dpIndex = 1;
int dpIndex = 1;
foreach(auto displayPlugin, standard) {
addDisplayPluginToMenu(displayPlugin, dpIndex);
dpIndex++;
addDisplayPluginToMenu(displayPlugin, dpIndex);
dpIndex++;
}
// after all plugins have been added to the menu, add a separator to the menu