Skip to content

Commit

Permalink
Initialize translations before creating the menubar.
Browse files Browse the repository at this point in the history
  • Loading branch information
rryan committed Apr 9, 2016
1 parent f05e7e4 commit 6e565d0
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/mixxx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ MixxxMainWindow::MixxxMainWindow(QApplication* pApp, const CmdlineArgs& args)
m_pSettingsManager = new SettingsManager(this, args.getSettingsPath());

initializeKeyboard();

// Menubar depends on translations.
mixxx::Translations::initializeTranslations(
m_pSettingsManager->settings(), pApp, args.getLocale());

createMenuBar();

initializeWindow();
Expand Down Expand Up @@ -166,9 +171,6 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) {

QString resourcePath = pConfig->getResourcePath();

mixxx::Translations::initializeTranslations(
pConfig, pApp, args.getLocale());

FontUtils::initializeFonts(resourcePath); // takes a long time

launchProgress(2);
Expand Down

0 comments on commit 6e565d0

Please sign in to comment.