History

Merge remote-tracking branch 'hifi/master' into android_places_goto

Cristian Luis Duarte committed 8 years ago

Commit c33f1fb2 parents 20d91b1 d1e2e9c70 files · +225 −304Browse files

Showing the changes to interface/src/Application.cpp (1 of 70 files). Show all

Unified · Split

interface/src/Application.cpp+6−0
@@ -2690,6 +2690,12 @@ void Application::initializeUi() { · 2689 unmodified lines
2690 // Now that the menu is instantiated, ensure the display plugin menu is properly updated2690 // Now that the menu is instantiated, ensure the display plugin menu is properly updated
2691 updateDisplayMode();2691 updateDisplayMode();
2692 flushMenuUpdates();2692 flushMenuUpdates();
2693
2694 // The display plugins are created before the menu now, so we need to do this here to hide the menu bar
2695 // now that it exists
2696 if (_window && _window->isFullScreen()) {
2697 setFullscreen(nullptr, true);
2698 }
2693}2699}
2694 2700
2695 2701