Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Don't check for elevation on Wine. It seems Wine always runs the process elevated (tested under Wine 1.4 on Ubuntu 12.04).

Browse Source
This commit is contained in:
LoRd_MuldeR 2012-04-05 16:24:33 +02:00
parent b3df635784
commit 65423ba125
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 12
#define VER_LAMEXP_BUILD 952
#define VER_LAMEXP_BUILD 953
///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)

7
src/Dialog_MainWindow.cpp
View File

@ -199,6 +199,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
m_outputFolderNoteBox->hide();
}
outputFolderViewClicked(QModelIndex());
refreshFavorites();
//Setup "Meta Data" tab
@ -2376,13 +2377,17 @@ void MainWindow::outputFolderViewClicked(const QModelIndex &index)
outputFolderView->setCurrentIndex(index);
}
if(m_fileSystemModel)
if(m_fileSystemModel && index.isValid())
{
QString selectedDir = m_fileSystemModel->filePath(index);
if(selectedDir.length() < 3) selectedDir.append(QDir::separator());
outputFolderLabel->setText(QDir::toNativeSeparators(selectedDir));
m_settings->outputDir(selectedDir);
}
else
{
outputFolderLabel->setText(QDir::toNativeSeparators(m_settings->outputDir()));
}
}
/*

2
src/Global.cpp
View File

@ -1117,7 +1117,7 @@ bool lamexp_init_qt(int argc, char* argv[])
g_lamexp_translation.names.insert(LAMEXP_DEFAULT_LANGID, "English");
//Check for process elevation
if(!lamexp_check_elevation())
if((!lamexp_check_elevation()) && (!lamexp_detect_wine()))
{
if(QMessageBox::warning(NULL, "LameXP", "<nobr>LameXP was started with elevated rights. This is a potential security risk!</nobr>", "Quit Program (Recommended)", "Ignore") == 0)
{