Skip to content

Commit

Permalink
Merge branch '2.3' of github.com:mixxxdj/mixxx
Browse files Browse the repository at this point in the history
  • Loading branch information
Holzhaus committed May 16, 2021
2 parents e79d345 + f16451e commit 84f1e56
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/mixxx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,11 @@ MixxxMainWindow::MixxxMainWindow(
// million different variables the first waveform may be horribly
// corrupted. See bug 521509 -- bkgood ?? -- vrince
setCentralWidget(m_pCentralWidget);

// 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 Expand Up @@ -1096,7 +1101,6 @@ bool MixxxMainWindow::loadConfiguredSkin() {
initializationProgressUpdate(100, "");
}
emit skinLoaded();
m_pMenuBar->show();
return m_pCentralWidget != nullptr;
}

Expand Down

0 comments on commit 84f1e56

Please sign in to comment.