From f829d696368635ac54c979a5d375a5fbd6b77bf4 Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Fri, 25 Feb 2011 22:03:39 +0100
Subject: [PATCH] Added an option to select a user-defined TEMP directory.

---
 doc/Changelog.html            |   1 +
 etc/Translation/Blank.ts      |  28 ++++++
 etc/Translation/LameXP_DE.ts  |  28 ++++++
 etc/Translation/LameXP_ES.ts  |  28 ++++++
 etc/Translation/LameXP_FR.ts  |  28 ++++++
 etc/Translation/LameXP_IT.ts  |  28 ++++++
 etc/Translation/LameXP_RU.ts  |  28 ++++++
 etc/Translation/LameXP_UK.ts  |  28 ++++++
 gui/MainWindow.ui             | 168 +++++++++++++++++++++++++++++++++-
 res/Icons.qrc                 |   1 +
 res/localization/LameXP_DE.qm | Bin 51877 -> 53035 bytes
 src/Config.h                  |   2 +-
 src/Decoder_ADPCM.cpp         |   2 +-
 src/Dialog_MainWindow.cpp     |  60 +++++++++++-
 src/Dialog_MainWindow.h       |   3 +
 src/Dialog_Processing.cpp     |   3 +-
 src/Dialog_Update.cpp         |   6 +-
 src/Encoder_Wave.cpp          |   5 +
 src/Filter_Downmix.cpp        |   2 +-
 src/Filter_Normalize.cpp      |   2 +-
 src/Filter_Resample.cpp       |   2 +-
 src/Filter_ToneAdjust.cpp     |   3 +-
 src/Global.cpp                |   6 +-
 src/Global.h                  |   2 +-
 src/Model_Settings.cpp        |   4 +
 src/Model_Settings.h          |   2 +
 src/Thread_Initialization.cpp |   2 +-
 src/Thread_Process.cpp        |   7 +-
 src/Thread_Process.h          |   3 +-
 29 files changed, 459 insertions(+), 23 deletions(-)

diff --git a/doc/Changelog.html b/doc/Changelog.html
index 9df5c04b..6dd46ea9 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -5,6 +5,7 @@
 
 Changes between v4.00 and v4.01:<br><ul>
 <li>Added an option to manually specify the number of parallel instances
+<li>Added an option to select a user-defined TEMP directory
 <li>Updated LAME encoder to v3.99.0.12 (2011-02-13), compiled with ICL 12.0.2
 <li>Updated Vorbis encoder to v2.87 using aoTuV Beta-6.01 (2011-02-22), compiled with ICL 11.1 and MSVC 9.0
 <li>Updated language files (big "thank you" to all contributors !!!)
diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 8299ea30..33a102c7 100644
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -621,6 +621,18 @@
         <source>More Instances</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> Temp Directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store temporary files in your system&apos;s default TEMP directory (Recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Reset Advanced Options </source>
         <translation type="unfinished"></translation>
@@ -949,6 +961,18 @@
         <source>You must add at least one file to the list before proceeding!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your currently selected TEMP folder does not exist anymore:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Default</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Low Diskspace Warning</source>
         <translation type="unfinished"></translation>
@@ -1077,6 +1101,10 @@
         <source>%1 Instance(s)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Cannot write to the selected directory. Please choose another directory!</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Do you really want to disable the update reminder?</source>
         <translation type="unfinished"></translation>
diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts
index 767b2a9c..517268e3 100644
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -1166,6 +1166,34 @@
         <source>%1 Instance(s)</source>
         <translation>%1 Instanz(en)</translation>
     </message>
+    <message>
+        <source> Temp Directory </source>
+        <translation> Temp Verzeichnis </translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>Durchsuchen...</translation>
+    </message>
+    <message>
+        <source>Store temporary files in your system&apos;s default TEMP directory (Recommended)</source>
+        <translation>Temporäre Dateien im standard TEMP Verzeichnis des Systems speichern (Empfohlen)</translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation>Nicht Gefunden</translation>
+    </message>
+    <message>
+        <source>Your currently selected TEMP folder does not exist anymore:</source>
+        <translation>Das derzeit ausgewählte TEMP Verzeichnis existiert nicht mehr:</translation>
+    </message>
+    <message>
+        <source>Restore Default</source>
+        <translation>Standard Wiederherstellen</translation>
+    </message>
+    <message>
+        <source>Cannot write to the selected directory. Please choose another directory!</source>
+        <translation>In das ausgewählte Verzeichnis kann nicht geschrieben werden. Bitte ein anderes Verzeichnis auswählen!</translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>
diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts
index 78ffb6e5..997830e4 100644
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -1165,6 +1165,34 @@
         <source>%1 Instance(s)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> Temp Directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store temporary files in your system&apos;s default TEMP directory (Recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your currently selected TEMP folder does not exist anymore:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot write to the selected directory. Please choose another directory!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>
diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index 6d3a6cd0..024ca40a 100644
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -1174,6 +1174,34 @@ Sélection automatique (par défaut)</translation>
         <source>%1 Instance(s)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> Temp Directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store temporary files in your system&apos;s default TEMP directory (Recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your currently selected TEMP folder does not exist anymore:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot write to the selected directory. Please choose another directory!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>
diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts
index bceed85b..54fe75e0 100644
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -1166,6 +1166,34 @@
         <source>%1 Instance(s)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> Temp Directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store temporary files in your system&apos;s default TEMP directory (Recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your currently selected TEMP folder does not exist anymore:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot write to the selected directory. Please choose another directory!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>
diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts
index c65d5b68..8d17b648 100644
--- a/etc/Translation/LameXP_RU.ts
+++ b/etc/Translation/LameXP_RU.ts
@@ -1168,6 +1168,34 @@
         <source>%1 Instance(s)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> Temp Directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store temporary files in your system&apos;s default TEMP directory (Recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your currently selected TEMP folder does not exist anymore:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot write to the selected directory. Please choose another directory!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>
diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts
index c9b4341a..2f35735a 100644
--- a/etc/Translation/LameXP_UK.ts
+++ b/etc/Translation/LameXP_UK.ts
@@ -1165,6 +1165,34 @@
         <source>%1 Instance(s)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> Temp Directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store temporary files in your system&apos;s default TEMP directory (Recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your currently selected TEMP folder does not exist anymore:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot write to the selected directory. Please choose another directory!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 8e6a8cbb..cfb09249 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -1058,7 +1058,7 @@
                <x>0</x>
                <y>0</y>
                <width>604</width>
-               <height>965</height>
+               <height>1091</height>
               </rect>
              </property>
              <layout class="QGridLayout" name="gridLayout_22">
@@ -2375,6 +2375,136 @@
                   </layout>
                  </widget>
                 </item>
+                <item row="8" column="0">
+                 <widget class="QGroupBox" name="groupBox_13">
+                  <property name="font">
+                   <font>
+                    <weight>50</weight>
+                    <bold>false</bold>
+                   </font>
+                  </property>
+                  <property name="title">
+                   <string> Temp Directory </string>
+                  </property>
+                  <layout class="QGridLayout" name="gridLayout_34">
+                   <item row="0" column="1">
+                    <layout class="QGridLayout" name="gridLayout_33">
+                     <item row="1" column="1">
+                      <widget class="QLineEdit" name="lineEditCustomTempFolder">
+                       <property name="readOnly">
+                        <bool>true</bool>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="2">
+                      <widget class="QPushButton" name="buttonBrowseCustomTempFolder">
+                       <property name="text">
+                        <string>Browse...</string>
+                       </property>
+                       <property name="icon">
+                        <iconset resource="../res/Icons.qrc">
+                         <normaloff>:/icons/folder_explore.png</normaloff>:/icons/folder_explore.png</iconset>
+                       </property>
+                       <property name="iconSize">
+                        <size>
+                         <width>16</width>
+                         <height>16</height>
+                        </size>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="3" column="1" colspan="2">
+                      <widget class="QCheckBox" name="checkBoxUseSystemTempFolder">
+                       <property name="text">
+                        <string>Store temporary files in your system's default TEMP directory (Recommended)</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="0" column="1" colspan="2">
+                      <spacer name="verticalSpacer_20">
+                       <property name="orientation">
+                        <enum>Qt::Vertical</enum>
+                       </property>
+                       <property name="sizeType">
+                        <enum>QSizePolicy::Fixed</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>20</width>
+                         <height>8</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item row="4" column="1" colspan="2">
+                      <spacer name="verticalSpacer_21">
+                       <property name="orientation">
+                        <enum>Qt::Vertical</enum>
+                       </property>
+                       <property name="sizeType">
+                        <enum>QSizePolicy::Fixed</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>20</width>
+                         <height>8</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item row="1" column="0">
+                      <spacer name="horizontalSpacer_37">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeType">
+                        <enum>QSizePolicy::Fixed</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>10</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item row="1" column="3">
+                      <spacer name="horizontalSpacer_38">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeType">
+                        <enum>QSizePolicy::Fixed</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>10</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item row="2" column="1" colspan="2">
+                      <spacer name="verticalSpacer_22">
+                       <property name="orientation">
+                        <enum>Qt::Vertical</enum>
+                       </property>
+                       <property name="sizeType">
+                        <enum>QSizePolicy::Fixed</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>20</width>
+                         <height>4</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                    </layout>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
                </layout>
               </item>
               <item row="6" column="0">
@@ -2960,6 +3090,10 @@
   <include location="../res/Icons.qrc"/>
   <include location="../res/Icons.qrc"/>
   <include location="../res/Icons.qrc"/>
+  <include location="../res/Icons.qrc"/>
+  <include location="../res/Icons.qrc"/>
+  <include location="../res/Icons.qrc"/>
+  <include location="../res/Icons.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -3426,5 +3560,37 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>checkBoxUseSystemTempFolder</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>lineEditCustomTempFolder</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>323</x>
+     <y>302</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>283</x>
+     <y>265</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>checkBoxUseSystemTempFolder</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>buttonBrowseCustomTempFolder</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>323</x>
+     <y>302</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>551</x>
+     <y>265</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
diff --git a/res/Icons.qrc b/res/Icons.qrc
index d41a4f75..ffa71e41 100644
--- a/res/Icons.qrc
+++ b/res/Icons.qrc
@@ -44,6 +44,7 @@
     <file>icons/folder_add.png</file>
     <file>icons/folder_go.png</file>
     <file>icons/folder_image.png</file>
+    <file>icons/folder_explore.png</file>
     <file>icons/folder_page.png</file>
     <file>icons/font.png</file>
     <file>icons/house.png</file>
diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm
index 167a10c20a8c73601adb8cdbabf2e15e34ff141f..642f2d9825c712f72dd036e2734053c80bc930b9 100644
GIT binary patch
delta 3881
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

delta 3246
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

diff --git a/src/Config.h b/src/Config.h
index b1b948d3..0c9f2af3 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -25,7 +25,7 @@
 #define VER_LAMEXP_MAJOR				4
 #define VER_LAMEXP_MINOR_HI				0
 #define VER_LAMEXP_MINOR_LO				1
-#define VER_LAMEXP_BUILD				336
+#define VER_LAMEXP_BUILD				338
 #define VER_LAMEXP_SUFFIX				Beta-3
 
 /*
diff --git a/src/Decoder_ADPCM.cpp b/src/Decoder_ADPCM.cpp
index db4ba498..9a515aa2 100644
--- a/src/Decoder_ADPCM.cpp
+++ b/src/Decoder_ADPCM.cpp
@@ -46,7 +46,7 @@ bool ADPCMDecoder::decode(const QString &sourceFile, const QString &outputFile,
 	QProcess process;
 	QStringList args;
 
-	process.setWorkingDirectory(lamexp_temp_folder());
+	process.setWorkingDirectory(QFileInfo(outputFile).canonicalPath());
 
 	args << "-V3" << "-S" << "--temp" << ".";
 	args << QDir::toNativeSeparators(sourceFile);
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index 8090495b..eea60c4f 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -220,10 +220,12 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
 	while(checkBoxNeroAAC2PassMode->isChecked() != m_settings->neroAACEnable2Pass()) checkBoxNeroAAC2PassMode->click();
 	while(checkBoxNormalizationFilter->isChecked() != m_settings->normalizationFilterEnabled()) checkBoxNormalizationFilter->click();
 	while(checkBoxAutoDetectInstances->isChecked() != (m_settings->maximumInstances() < 1)) checkBoxAutoDetectInstances->click();
+	while(checkBoxUseSystemTempFolder->isChecked() == m_settings->customTempPathEnabled()) checkBoxUseSystemTempFolder->click();
 	lineEditCustomParamLAME->setText(m_settings->customParametersLAME());
 	lineEditCustomParamOggEnc->setText(m_settings->customParametersOggEnc());
 	lineEditCustomParamNeroAAC->setText(m_settings->customParametersNeroAAC());
 	lineEditCustomParamFLAC->setText(m_settings->customParametersFLAC());
+	lineEditCustomTempFolder->setText(QDir::toNativeSeparators(m_settings->customTempPath()));
 	connect(sliderLameAlgoQuality, SIGNAL(valueChanged(int)), this, SLOT(updateLameAlgoQuality(int)));
 	connect(checkBoxBitrateManagement, SIGNAL(clicked(bool)), this, SLOT(bitrateManagementEnabledChanged(bool)));
 	connect(spinBoxBitrateManagementMin, SIGNAL(valueChanged(int)), this, SLOT(bitrateManagementMinChanged(int)));
@@ -243,6 +245,9 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
 	connect(lineEditCustomParamFLAC, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
 	connect(sliderMaxInstances, SIGNAL(valueChanged(int)), this, SLOT(updateMaximumInstances(int)));
 	connect(checkBoxAutoDetectInstances, SIGNAL(clicked(bool)), this, SLOT(autoDetectInstancesChanged(bool)));
+	connect(buttonBrowseCustomTempFolder, SIGNAL(clicked()), this, SLOT(browseCustomTempFolderButtonClicked()));
+	connect(lineEditCustomTempFolder, SIGNAL(textChanged(QString)), this, SLOT(customTempFolderChanged(QString)));
+	connect(checkBoxUseSystemTempFolder, SIGNAL(clicked(bool)), this, SLOT(useCustomTempFolderChanged(bool)));
 	connect(buttonResetAdvancedOptions, SIGNAL(clicked()), this, SLOT(resetAdvancedOptionsButtonClicked()));
 	updateLameAlgoQuality(sliderLameAlgoQuality->value());
 	updateMaximumInstances(sliderMaxInstances->value());
@@ -461,7 +466,7 @@ bool MainWindow::installWMADecoder(void)
 
 	while(true)
 	{
-		QString setupFile = QString("%1/%2.exe").arg(lamexp_temp_folder(), lamexp_rand_str());
+		QString setupFile = QString("%1/%2.exe").arg(lamexp_temp_folder2(), lamexp_rand_str());
 
 		QProcess process;
 		process.setWorkingDirectory(QFileInfo(setupFile).absolutePath());
@@ -931,11 +936,20 @@ void MainWindow::encodeButtonClicked(void)
 		return;
 	}
 	
-	__int64 currentFreeDiskspace = lamexp_free_diskspace(lamexp_temp_folder());
+	QString tempFolder = m_settings->customTempPathEnabled() ? m_settings->customTempPath() : lamexp_temp_folder2();
+	if(!QFileInfo(tempFolder).exists() || !QFileInfo(tempFolder).isDir())
+	{
+		if(QMessageBox::warning(this, tr("Not Found"), QString("<nobr>%1</nobr><br><nobr>%2</nobr>").arg(tr("Your currently selected TEMP folder does not exist anymore:"), QDir::toNativeSeparators(tempFolder)), tr("Restore Default"), tr("Cancel")) == 0)
+		{
+			while(checkBoxUseSystemTempFolder->isChecked() == m_settings->customTempPathEnabledDefault()) checkBoxUseSystemTempFolder->click();
+		}
+		return;
+	}
 
+	qint64 currentFreeDiskspace = lamexp_free_diskspace(tempFolder);
 	if(currentFreeDiskspace < (oneGigabyte * minimumFreeDiskspaceMultiplier))
 	{
-		QStringList tempFolderParts = lamexp_temp_folder().split("/", QString::SkipEmptyParts, Qt::CaseInsensitive);
+		QStringList tempFolderParts = tempFolder.split("/", QString::SkipEmptyParts, Qt::CaseInsensitive);
 		tempFolderParts.takeLast();
 		if(m_settings->soundsEnabled()) PlaySound(MAKEINTRESOURCE(IDR_WAVE_WHAMMY), GetModuleHandle(NULL), SND_RESOURCE | SND_SYNC);
 		switch(QMessageBox::warning(this, tr("Low Diskspace Warning"), QString("<nobr>%1</nobr><br><nobr>%2</nobr><br><br>%3").arg(tr("There are less than %1 GB of free diskspace available on your system's TEMP folder.").arg(QString::number(minimumFreeDiskspaceMultiplier)), tr("It is highly recommend to free up more diskspace before proceeding with the encode!"), tr("Your TEMP folder is located at:")).append("<br><nobr><i><a href=\"file:///%3\">%3</a></i></nobr><br>").arg(tempFolderParts.join("\\")), tr("Abort Encoding Process"), tr("Clean Disk Now"), tr("Ignore")))
@@ -1950,6 +1964,44 @@ void MainWindow::autoDetectInstancesChanged(bool checked)
 	m_settings->maximumInstances(checked ? NULL : sliderMaxInstances->value());
 }
 
+/*
+ * Browse for custom TEMP folder button clicked
+ */
+void MainWindow::browseCustomTempFolderButtonClicked(void)
+{
+	QString newTempFolder = QFileDialog::getExistingDirectory(this);
+
+	if(!newTempFolder.isEmpty())
+	{
+		QFile writeTest(QString("%1/~%2.tmp").arg(newTempFolder, lamexp_rand_str()));
+		if(writeTest.open(QIODevice::ReadWrite))
+		{
+			writeTest.remove();
+			lineEditCustomTempFolder->setText(QDir::toNativeSeparators(newTempFolder));
+		}
+		else
+		{
+			QMessageBox::warning(this, tr("Access Denied"), tr("Cannot write to the selected directory. Please choose another directory!"));
+		}
+	}
+}
+
+/*
+ * Custom TEMP folder changed
+ */
+void MainWindow::customTempFolderChanged(const QString &text)
+{
+	m_settings->customTempPath(QDir::fromNativeSeparators(text));
+}
+
+/*
+ * Use custom TEMP folder option changed
+ */
+void MainWindow::useCustomTempFolderChanged(bool checked)
+{
+	m_settings->customTempPathEnabled(!checked);
+}
+
 /*
  * Reset all advanced options to their defaults
  */
@@ -1968,10 +2020,12 @@ void MainWindow::resetAdvancedOptionsButtonClicked(void)
 	while(checkBoxNeroAAC2PassMode->isChecked() != m_settings->neroAACEnable2PassDefault()) checkBoxNeroAAC2PassMode->click();
 	while(checkBoxNormalizationFilter->isChecked() != m_settings->normalizationFilterEnabledDefault()) checkBoxNormalizationFilter->click();
 	while(checkBoxAutoDetectInstances->isChecked() != (m_settings->maximumInstancesDefault() < 1)) checkBoxAutoDetectInstances->click();
+	while(checkBoxUseSystemTempFolder->isChecked() == m_settings->customTempPathEnabledDefault()) checkBoxUseSystemTempFolder->click();
 	lineEditCustomParamLAME->setText(m_settings->customParametersLAMEDefault());
 	lineEditCustomParamOggEnc->setText(m_settings->customParametersOggEncDefault());
 	lineEditCustomParamNeroAAC->setText(m_settings->customParametersNeroAACDefault());
 	lineEditCustomParamFLAC->setText(m_settings->customParametersFLACDefault());
+	lineEditCustomTempFolder->setText(QDir::toNativeSeparators(m_settings->customTempPathDefault()));
 	customParamsChanged();
 	scrollArea->verticalScrollBar()->setValue(0);
 }
diff --git a/src/Dialog_MainWindow.h b/src/Dialog_MainWindow.h
index f1693adc..e3f91b37 100644
--- a/src/Dialog_MainWindow.h
+++ b/src/Dialog_MainWindow.h
@@ -95,6 +95,9 @@ private slots:
 	void customParamsChanged(void);
 	void updateMaximumInstances(int value);
 	void autoDetectInstancesChanged(bool checked);
+	void browseCustomTempFolderButtonClicked(void);
+	void customTempFolderChanged(const QString &text);
+	void useCustomTempFolderChanged(bool checked);
 	void resetAdvancedOptionsButtonClicked(void);
 	void sourceModelChanged(void);
 	void metaTagsEnabledChanged(void);
diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp
index 228edab1..1a3b6b0f 100644
--- a/src/Dialog_Processing.cpp
+++ b/src/Dialog_Processing.cpp
@@ -581,7 +581,8 @@ void ProcessingDialog::startNextJob(void)
 	ProcessThread *thread = new ProcessThread
 	(
 		currentFile,
-		(m_settings->outputToSourceDir() ? QFileInfo(currentFile.filePath()).absolutePath(): m_settings->outputDir()),
+		(m_settings->outputToSourceDir() ? QFileInfo(currentFile.filePath()).absolutePath() : m_settings->outputDir()),
+		(m_settings->customTempPathEnabled() ? m_settings->customTempPath() : lamexp_temp_folder2()),
 		encoder,
 		m_settings->prependRelativeSourcePath()
 	);
diff --git a/src/Dialog_Update.cpp b/src/Dialog_Update.cpp
index 1fc0c471..ab4fa7df 100644
--- a/src/Dialog_Update.cpp
+++ b/src/Dialog_Update.cpp
@@ -238,7 +238,7 @@ void UpdateDialog::checkForUpdates(void)
 		if(connectionScore < MIN_CONNSCORE)
 		{
 			m_logFile->append(QStringList() << "" << "Testing host:" << known_hosts[i] << "");
-			QString outFile = QString("%1/%2.htm").arg(lamexp_temp_folder(), lamexp_rand_str());
+			QString outFile = QString("%1/%2.htm").arg(lamexp_temp_folder2(), lamexp_rand_str());
 			if(getFile(known_hosts[i], outFile))
 			{
 				connectionScore++;
@@ -357,8 +357,8 @@ bool UpdateDialog::tryUpdateMirror(UpdateInfo *updateInfo, const QString &url)
 	m_logFile->append(QStringList() << "" << "Trying mirror:" << url);
 	
 	QString randPart = lamexp_rand_str();
-	QString outFileVersionInfo = QString("%1/%2.ver").arg(lamexp_temp_folder(), randPart);
-	QString outFileSignature = QString("%1/%2.sig").arg(lamexp_temp_folder(), randPart);
+	QString outFileVersionInfo = QString("%1/%2.ver").arg(lamexp_temp_folder2(), randPart);
+	QString outFileSignature = QString("%1/%2.sig").arg(lamexp_temp_folder2(), randPart);
 
 	m_logFile->append(QStringList() << "" << "Downloading update info:");
 	bool ok1 = getFile(QString("%1%2").arg(url, mirror_url_postfix[lamexp_version_demo() ? 1 : 0]), outFileVersionInfo);
diff --git a/src/Encoder_Wave.cpp b/src/Encoder_Wave.cpp
index 8c771143..859986a5 100644
--- a/src/Encoder_Wave.cpp
+++ b/src/Encoder_Wave.cpp
@@ -45,6 +45,10 @@ bool WaveEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn
 	memset(&fileOperation, 0, sizeof(SHFILEOPSTRUCTW));
 	fileOperation.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOCONFIRMMKDIR | FOF_NOERRORUI | FOF_FILESONLY;
 
+	emit messageLogged(QString("Copy file \"%1\" to \"%2\"").arg(sourceFile, outputFile));
+	fileOperation.wFunc = FO_COPY;
+
+	/*
 	if(lamexp_temp_folder().compare(QFileInfo(sourceFile).canonicalPath(), Qt::CaseInsensitive) == 0)
 	{
 		//If the source is in the TEMP folder take shortcut and move the file
@@ -57,6 +61,7 @@ bool WaveEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn
 		emit messageLogged(QString("Copy file \"%1\" to \"%2\"").arg(sourceFile, outputFile));
 		fileOperation.wFunc = FO_COPY;
 	}
+	*/
 	
 	size_t srcLen = wcslen(reinterpret_cast<const wchar_t*>(sourceFile.utf16())) + 3;
 	wchar_t *srcBuffer = new wchar_t[srcLen];
diff --git a/src/Filter_Downmix.cpp b/src/Filter_Downmix.cpp
index 89023993..a7bfd207 100644
--- a/src/Filter_Downmix.cpp
+++ b/src/Filter_Downmix.cpp
@@ -46,7 +46,7 @@ bool DownmixFilter::apply(const QString &sourceFile, const QString &outputFile,
 	QProcess process;
 	QStringList args;
 
-	process.setWorkingDirectory(lamexp_temp_folder());
+	process.setWorkingDirectory(QFileInfo(outputFile).canonicalPath());
 
 	args << "-V3";
 	args << "--guard" << "--temp" << ".";
diff --git a/src/Filter_Normalize.cpp b/src/Filter_Normalize.cpp
index ccc9a142..d9fec1f9 100644
--- a/src/Filter_Normalize.cpp
+++ b/src/Filter_Normalize.cpp
@@ -48,7 +48,7 @@ bool NormalizeFilter::apply(const QString &sourceFile, const QString &outputFile
 	QProcess process;
 	QStringList args;
 
-	process.setWorkingDirectory(lamexp_temp_folder());
+	process.setWorkingDirectory(QFileInfo(outputFile).canonicalPath());
 
 	args << "-V3";
 	args << "--temp" << ".";
diff --git a/src/Filter_Resample.cpp b/src/Filter_Resample.cpp
index 4caaecc9..7855cc7c 100644
--- a/src/Filter_Resample.cpp
+++ b/src/Filter_Resample.cpp
@@ -48,7 +48,7 @@ bool ResampleFilter::apply(const QString &sourceFile, const QString &outputFile,
 	QProcess process;
 	QStringList args;
 
-	process.setWorkingDirectory(lamexp_temp_folder());
+	process.setWorkingDirectory(QFileInfo(outputFile).canonicalPath());
 
 	args << "-V3";
 	args << "--guard" << "--temp" << ".";
diff --git a/src/Filter_ToneAdjust.cpp b/src/Filter_ToneAdjust.cpp
index 6d125da3..b9f98b55 100644
--- a/src/Filter_ToneAdjust.cpp
+++ b/src/Filter_ToneAdjust.cpp
@@ -26,6 +26,7 @@
 #include <QDir>
 #include <QProcess>
 #include <QRegExp>
+#include <QFileInfo>
 
 ToneAdjustFilter::ToneAdjustFilter(int bass, int treble)
 :
@@ -49,7 +50,7 @@ bool ToneAdjustFilter::apply(const QString &sourceFile, const QString &outputFil
 	QProcess process;
 	QStringList args;
 
-	process.setWorkingDirectory(lamexp_temp_folder());
+	process.setWorkingDirectory(QFileInfo(outputFile).canonicalPath());
 
 	args << "-V3";
 	args << "--guard" << "--temp" << ".";
diff --git a/src/Global.cpp b/src/Global.cpp
index 03240a5a..e1fa692b 100644
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -779,7 +779,7 @@ QString lamexp_rand_str(void)
 /*
  * Get LameXP temp folder
  */
-const QString &lamexp_temp_folder(void)
+const QString &lamexp_temp_folder2(void)
 {
 	static const char *TEMP_STR = "Temp";
 
@@ -1155,8 +1155,8 @@ bool lamexp_remove_file(const QString &filename)
 	{
 		if(!QFile::remove(filename))
 		{
-			DWORD attributes = GetFileAttributesW(reinterpret_cast<const wchar_t*>(filename.utf16()));
-			SetFileAttributesW(reinterpret_cast<const wchar_t*>(filename.utf16()), (attributes & (~FILE_ATTRIBUTE_READONLY)));
+			DWORD attributes = GetFileAttributesW(QWCHAR(filename));
+			SetFileAttributesW(QWCHAR(filename), (attributes & (~FILE_ATTRIBUTE_READONLY)));
 			if(!QFile::remove(filename))
 			{
 				qWarning("Could not delete \"%s\"", filename.toLatin1().constData());
diff --git a/src/Global.h b/src/Global.h
index 03e58e57..173296a9 100644
--- a/src/Global.h
+++ b/src/Global.h
@@ -88,7 +88,7 @@ const QString lamexp_lookup_tool(const QString &toolName);
 unsigned int lamexp_tool_version(const QString &toolName);
 void lamexp_finalization(void);
 QString lamexp_rand_str(void);
-const QString &lamexp_temp_folder(void);
+const QString &lamexp_temp_folder2(void);
 void lamexp_ipc_read(unsigned int *command, char* message, size_t buffSize);
 void lamexp_ipc_send(unsigned int command, const char* message);
 lamexp_cpu_t lamexp_detect_cpu_features(void);
diff --git a/src/Model_Settings.cpp b/src/Model_Settings.cpp
index f6b91798..c1914605 100644
--- a/src/Model_Settings.cpp
+++ b/src/Model_Settings.cpp
@@ -101,6 +101,8 @@ MAKE_ID(customParametersNeroAAC, "AdvancedOptions/CustomParameters/NeroAAC");
 MAKE_ID(customParametersFLAC, "AdvancedOptions/CustomParameters/FLAC");
 MAKE_ID(metaInfoPosition, "MetaInformation/PlaylistPosition");
 MAKE_ID(maximumInstances, "AdvancedOptions/Threading/MaximumInstances");
+MAKE_ID(customTempPath, "AdvancedOptions/TempDirectory/CustomPath");
+MAKE_ID(customTempPathEnabled, "AdvancedOptions/TempDirectory/UseCustomPath");
 
 //LUT
 const int SettingsModel::mp3Bitrates[15] = {32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1};
@@ -260,3 +262,5 @@ MAKE_OPTION2(customParametersNeroAAC, QString());
 MAKE_OPTION2(customParametersFLAC, QString());
 MAKE_OPTION4(metaInfoPosition, UINT_MAX);
 MAKE_OPTION4(maximumInstances, 0);
+MAKE_OPTION2(customTempPath, QDesktopServices::storageLocation(QDesktopServices::TempLocation));
+MAKE_OPTION3(customTempPathEnabled, false);
diff --git a/src/Model_Settings.h b/src/Model_Settings.h
index 032a92f0..48e1a875 100644
--- a/src/Model_Settings.h
+++ b/src/Model_Settings.h
@@ -111,6 +111,8 @@ public:
 	MAKE_OPTION_DEC2(customParametersFLAC);
 	MAKE_OPTION_DEC4(metaInfoPosition);
 	MAKE_OPTION_DEC4(maximumInstances);
+	MAKE_OPTION_DEC2(customTempPath);
+	MAKE_OPTION_DEC3(customTempPathEnabled);
 
 	//Misc
 	void validate(void);
diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp
index af8c1e86..2b98fb34 100644
--- a/src/Thread_Initialization.cpp
+++ b/src/Thread_Initialization.cpp
@@ -133,7 +133,7 @@ void InitializationThread::run()
 			{
 				throw "The required checksum is missing, take care!";
 			}
-			LockedFile *lockedFile = new LockedFile(QString(":/tools/%1").arg(toolName), QString(lamexp_temp_folder()).append(QString("/tool_%1").arg(toolName)), toolHash);
+			LockedFile *lockedFile = new LockedFile(QString(":/tools/%1").arg(toolName), QString(lamexp_temp_folder2()).append(QString("/tool_%1").arg(toolName)), toolHash);
 			lamexp_register_tool(toolName, lockedFile, toolVersion);
 		}
 		catch(char *errorMsg)
diff --git a/src/Thread_Process.cpp b/src/Thread_Process.cpp
index 3da17381..3746c455 100644
--- a/src/Thread_Process.cpp
+++ b/src/Thread_Process.cpp
@@ -46,10 +46,11 @@ QMutex *ProcessThread::m_mutex_genFileName = NULL;
 // Constructor
 ////////////////////////////////////////////////////////////
 
-ProcessThread::ProcessThread(const AudioFileModel &audioFile, const QString &outputDirectory, AbstractEncoder *encoder, const bool prependRelativeSourcePath)
+ProcessThread::ProcessThread(const AudioFileModel &audioFile, const QString &outputDirectory, const QString &tempDirectory, AbstractEncoder *encoder, const bool prependRelativeSourcePath)
 :
 	m_audioFile(audioFile),
 	m_outputDirectory(outputDirectory),
+	m_tempDirectory(tempDirectory),
 	m_encoder(encoder),
 	m_jobId(QUuid::createUuid()),
 	m_prependRelativeSourcePath(prependRelativeSourcePath),
@@ -303,11 +304,11 @@ QString ProcessThread::generateOutFileName(void)
 QString ProcessThread::generateTempFileName(void)
 {
 	QMutexLocker lock(m_mutex_genFileName);
-	QString tempFileName = QString("%1/%2.wav").arg(lamexp_temp_folder(), lamexp_rand_str());
+	QString tempFileName = QString("%1/%2.wav").arg(m_tempDirectory, lamexp_rand_str());
 
 	while(QFileInfo(tempFileName).exists())
 	{
-		tempFileName = QString("%1/%2.wav").arg(lamexp_temp_folder(), lamexp_rand_str());
+		tempFileName = QString("%1/%2.wav").arg(m_tempDirectory, lamexp_rand_str());
 	}
 
 	QFile file(tempFileName);
diff --git a/src/Thread_Process.h b/src/Thread_Process.h
index d1fac69c..c10e8c72 100644
--- a/src/Thread_Process.h
+++ b/src/Thread_Process.h
@@ -36,7 +36,7 @@ class ProcessThread: public QThread
 	Q_OBJECT
 
 public:
-	ProcessThread(const AudioFileModel &audioFile, const QString &outputDirectory, AbstractEncoder *encoder, const bool prependRelativeSourcePath);
+	ProcessThread(const AudioFileModel &audioFile, const QString &outputDirectory, const QString &tempDirectory, AbstractEncoder *encoder, const bool prependRelativeSourcePath);
 	~ProcessThread(void);
 	
 	void run();
@@ -72,6 +72,7 @@ private:
 	AudioFileModel m_audioFile;
 	AbstractEncoder *m_encoder;
 	const QString m_outputDirectory;
+	const QString m_tempDirectory;
 	volatile bool m_aborted;
 	ProcessStep m_currentStep;
 	QStringList m_tempFiles;