Skip to content

Commit

Permalink
Merge pull request #3862 from ronso0/menubar-launch-skin
Browse files Browse the repository at this point in the history
show the menubar after replacing the launch image
  • Loading branch information
Holzhaus authored May 15, 2021
2 parents 0406cc0 + 3fe6468 commit f16451e
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/mixxx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -583,8 +583,6 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) {
// Mixxx class as a callback.
emit skinLoaded();

m_pMenuBar->show();

// Wait until all other ControlObjects are set up before initializing
// controllers
m_pControllerManager->setUpDevices();
Expand Down Expand Up @@ -695,6 +693,11 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) {
// million different variables the first waveform may be horribly
// corrupted. See bug 521509 -- bkgood ?? -- vrince
setCentralWidget(m_pWidgetParent);

// Show the menubar after the launch image is replaced by the skin widget,
// otherwise it would shift the launch image shortly before the skin is visible.
m_pMenuBar->show();

// The launch image widget is automatically disposed, but we still have a
// pointer to it.
m_pLaunchImage = nullptr;
Expand Down

0 comments on commit f16451e

Please sign in to comment.