Bugfix: Correctly disable Nero AAC option, if the Nero AAC encoder isn't available. Before this check was skipped, if Nero notifications were disabled!

This commit is contained in:
LoRd_MuldeR 2011-05-20 19:21:09 +02:00
parent c44d0020c9
commit a66e6e9203
2 changed files with 8 additions and 5 deletions

View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_MINOR_LO 2
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 2 #define VER_LAMEXP_PATCH 2
#define VER_LAMEXP_BUILD 538 #define VER_LAMEXP_BUILD 539
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tools versions // Tools versions

View File

@ -918,9 +918,9 @@ void MainWindow::windowShown(void)
} }
//Check for AAC support //Check for AAC support
if(m_settings->neroAacNotificationsEnabled()) if(lamexp_check_tool("neroAacEnc.exe") && lamexp_check_tool("neroAacDec.exe") && lamexp_check_tool("neroAacTag.exe"))
{ {
if(lamexp_check_tool("neroAacEnc.exe") && lamexp_check_tool("neroAacDec.exe") && lamexp_check_tool("neroAacTag.exe")) if(m_settings->neroAacNotificationsEnabled())
{ {
if(lamexp_tool_version("neroAacEnc.exe") < lamexp_toolver_neroaac()) if(lamexp_tool_version("neroAacEnc.exe") < lamexp_toolver_neroaac())
{ {
@ -932,9 +932,12 @@ void MainWindow::windowShown(void)
QMessageBox::information(this, tr("AAC Encoder Outdated"), messageText); QMessageBox::information(this, tr("AAC Encoder Outdated"), messageText);
} }
} }
else }
else
{
radioButtonEncoderAAC->setEnabled(false);
if(m_settings->neroAacNotificationsEnabled())
{ {
radioButtonEncoderAAC->setEnabled(false);
QString appPath = QDir(QCoreApplication::applicationDirPath()).canonicalPath(); QString appPath = QDir(QCoreApplication::applicationDirPath()).canonicalPath();
if(appPath.isEmpty()) appPath = QCoreApplication::applicationDirPath(); if(appPath.isEmpty()) appPath = QCoreApplication::applicationDirPath();
QString messageText; QString messageText;