From 68806eefb16bd6d4e888dc1e944659b90e0f2648 Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Sun, 9 Apr 2017 19:17:00 +0200
Subject: [PATCH] Adapted for latest MUtils changes in clean_file_name()
 function. The "pretty" parameter is now used/required.

---
 doc/Changelog.html         |  2 +-
 doc/Changelog.md           |  1 +
 src/Config.h               |  2 +-
 src/Dialog_MainWindow.cpp  | 12 ++++++------
 src/Dialog_Processing.cpp  |  2 +-
 src/Thread_CueSplitter.cpp |  4 ++--
 src/Thread_Process.cpp     |  8 ++++----
 7 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/doc/Changelog.html b/doc/Changelog.html
index bd41e696..a14d6238 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -3,7 +3,7 @@
 h='&#x67;&#x6d;&#120;';a='&#64;';n='&#x6d;&#x75;&#108;&#100;&#x65;&#114;&#50;';e=n+a+h;
 document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'" clas'+'s="em' + 'ail">'+e+'<\/'+'a'+'>');
 // -->
-</script><noscript>&#x6d;&#x75;&#108;&#100;&#x65;&#114;&#50;&#32;&#x61;&#116;&#32;&#x67;&#x6d;&#120;</noscript>&gt; | <a href="http://muldersoft.com/" class="uri">http://muldersoft.com/</a></h2> </header> <nav id="TOC"> <ul> <li><a href="#lamexp-v4.xx-history"><span class="toc-section-number">1</span> LameXP v4.xx History</a><ul> <li><a href="#lamexp-v4.15-2017--">LameXP v4.15 [2017-??-??]</a></li> <li><a href="#lamexp-v4.14-2016-11-19">LameXP v4.14 [2016-11-19]</a></li> <li><a href="#lamexp-v4.13-2015-12-12">LameXP v4.13 [2015-12-12]</a></li> <li><a href="#lamexp-v4.12-2015-10-23">LameXP v4.12 [2015-10-23]</a></li> <li><a href="#lamexp-v4.11-2015-04-05">LameXP v4.11 [2015-04-05]</a></li> <li><a href="#lamexp-v4.10-2014-06-23">LameXP v4.10 [2014-06-23]</a></li> <li><a href="#lamexp-v4.09-2014-01-26">LameXP v4.09 [2014-01-26]</a></li> <li><a href="#lamexp-v4.08-2013-09-04">LameXP v4.08 [2013-09-04]</a></li> <li><a href="#lamexp-v4.07-2013-04-28">LameXP v4.07 [2013-04-28]</a></li> <li><a href="#lamexp-v4.06-2012-11-04">LameXP v4.06 [2012-11-04]</a></li> <li><a href="#lamexp-v4.05-2012-09-03">LameXP v4.05 [2012-09-03]</a></li> <li><a href="#lamexp-v4.04-2012-04-26">LameXP v4.04 [2012-04-26]</a></li> <li><a href="#lamexp-v4.03-2011-11-12">LameXP v4.03 [2011-11-12]</a></li> <li><a href="#lamexp-v4.02-2011-06-14">LameXP v4.02 [2011-06-14]</a></li> <li><a href="#lamexp-v4.01-2011-04-04">LameXP v4.01 [2011-04-04]</a></li> <li><a href="#lamexp-v4.00-2011-02-21">LameXP v4.00 [2011-02-21]</a></li> </ul></li> <li><a href="#lamexp-v3.xx-history"><span class="toc-section-number">2</span> LameXP v3.xx History</a><ul> <li><a href="#lamexp-v3.19-2010-07-12">LameXP v3.19 [2010-07-12]</a></li> <li><a href="#lamexp-v3.18-2010-05-08">LameXP v3.18 [2010-05-08]</a></li> <li><a href="#lamexp-v3.17-2010-02-21">LameXP v3.17 [2010-02-21]</a></li> <li><a href="#lamexp-v3.16-2010-01-26">LameXP v3.16 [2010-01-26]</a></li> <li><a href="#lamexp-v3.15-2009-12-24">LameXP v3.15 [2009-12-24]</a></li> <li><a href="#lamexp-v3.14-2009-12-01">LameXP v3.14 [2009-12-01]</a></li> <li><a href="#lamexp-v3.13-2009-10-21">LameXP v3.13 [2009-10-21]</a></li> <li><a href="#lamexp-v3.12-2009-09-19">LameXP v3.12 [2009-09-19]</a></li> <li><a href="#lamexp-v3.11-2009-06-22">LameXP v3.11 [2009-06-22]</a></li> <li><a href="#lamexp-v3.10-2009-06-11">LameXP v3.10 [2009-06-11]</a></li> <li><a href="#lamexp-v3.09-2009-06-01">LameXP v3.09 [2009-06-01]</a></li> <li><a href="#lamexp-v3.08-2009-03-05">LameXP v3.08 [2009-03-05]</a></li> <li><a href="#lamexp-v3.07-2008-12-24">LameXP v3.07 [2008-12-24]</a></li> <li><a href="#lamexp-v3.06-2008-10-26">LameXP v3.06 [2008-10-26]</a></li> <li><a href="#lamexp-v3.05-2008-10-11">LameXP v3.05 [2008-10-11]</a></li> <li><a href="#lamexp-v3.04-2008-09-26">LameXP v3.04 [2008-09-26]</a></li> <li><a href="#lamexp-v3.03-2008-08-12">LameXP v3.03 [2008-08-12]</a></li> <li><a href="#lamexp-v3.02-2008-08-06">LameXP v3.02 [2008-08-06]</a></li> <li><a href="#lamexp-v3.01-2008-08-01">LameXP v3.01 [2008-08-01]</a></li> <li><a href="#lamexp-v3.00-2008-07-04">LameXP v3.00 [2008-07-04]</a></li> </ul></li> <li><a href="#lamexp-v2.xx-history"><span class="toc-section-number">3</span> LameXP v2.xx History</a><ul> <li><a href="#lamexp-v2.03-2007-08-17">LameXP v2.03 [2007-08-17]</a></li> <li><a href="#lamexp-v2.00-2007-02-19">LameXP v2.00 [2007-02-19]</a></li> </ul></li> <li><a href="#lamexp-v1.xx-history"><span class="toc-section-number">4</span> LameXP v1.xx History</a><ul> <li><a href="#lamexp-v1.00-2004-12-10">LameXP v1.00 [2004-12-10]</a></li> </ul></li> </ul> </nav> <h1 id="lamexp-v4.xx-history"><span class="header-section-number">1</span> LameXP v4.xx History</h1> <h2 id="lamexp-v4.15-2017--" class="unnumbered">LameXP v4.15 [2017-??-??]</h2> <ul> <li>Fixed a bug in auto-rename feature, that caused problems when a meta-tag contained path separators</li> <li>Fixed included MediaInfo binary not working on processor <em>without</em> SSE2 support</li> <li>Some improvements for &quot;high DPI&quot; screens: Adjust initial window size according to DPI setting</li> <li>Updated Opus encoder/decoder libraries to v1.2-alpha2 (2017-03-03) and Opus-Tools to v0.1.10 (2017-02-22)</li> <li>Updated MediaInfo to v0.7.93 (2017-02-28), compiled with ICL 17.0 and MSVC 12.0</li> <li>Updated FAAD decoder to v2.7 from CVS in order to include latest libFAAD fixes (2016-11-11)</li> <li>Some tweaks to the auto-update function in order to speed-up the update check in most situations</li> </ul> <h2 id="lamexp-v4.14-2016-11-19" class="unnumbered">LameXP v4.14 [2016-11-19]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2015 with Update-3</li> <li>Fixed the location of temporary intermediate files for SoX-based audio effects</li> <li>Fixed embedding of meta tags with OggEnc2 when reading directly from OGG/FLAC input file</li> <li>Fixed encoding of <em>non</em>-Stereo sources with NeroAAC, when &quot;HE-AAC <em>v2</em> (SBR+PS)&quot; is selected</li> <li>Fixed a bug that would cause the encoding job to fail, when an audio filter is <em>skipped</em></li> <li>Enabled the &quot;built-in&quot; resampler for QAAC encoder</li> <li>The &quot;Algorithm Quality&quot; slider now also affects the QAAC encoder</li> <li>Added &quot;AVX&quot; (Advanced Vector Extensions) to CPU feature detection code</li> <li>Updated Opus encoder/decoder libraries to v1.2-alpha and Opus-Tools to v0.1.9 (2016-11-04)</li> <li>Updated LAME encoder to v3.100 Alpha-2 (2016-01-29), compiled with ICL 15.0 and MSVC 12.0</li> <li>Updated FLAC encoder/decoder to v1.3.1 (2016-10-04), compiled with ICL 17.0 and MSVC 12.0</li> <li>Updated MediaInfo to v0.7.90 (2016-10-31), compiled with ICL 17.0 and MSVC 12.0</li> <li>Updated mpg123 decoder to v1.23.8 (2016-09-27), compiled with GCC 6.2.0</li> <li>Updated ALAC decoder to refalac v1.61 (2016-10-02)</li> <li>Updated WavPack decoder to v4.80.0 (2016-03-28), compiled with ICL 15.0 and MSVC 12.0</li> <li>Updated GnuPG to v1.4.21 (2016-08-17), compiled with GCC 6.1.0</li> <li>Updated QAAC add-in to the to QAAC v2.61 (2016-10-02)</li> <li>Updated FhgAacEnc add-in to &quot;Case&quot; edition (2015-10-24)</li> <li>Improved auto-update function (faster Internet connectivity check)</li> <li>Updated language files (big thank-you to all contributors !!!)</li> </ul> <h2 id="lamexp-v4.13-2015-12-12" class="unnumbered">LameXP v4.13 [2015-12-12]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2015 with Update-1</li> <li>Apply the original file's &quot;creation&quot; and &quot;last modified&quot; date/time to the output file (optional)</li> <li>Updated Vorbis encoder to OggEnc v2.88 (2015-09-10), using libvorbis v1.3.5 and aoTuV b6.03_2015</li> <li>Updated MediaInfo to v0.7.78 (2015-10-02), compiled with ICL 15.0 and MSVC 12.0</li> <li>Fixed resampling bug with Vorbis encoder, regression in OggEnc v2.87</li> <li>Fixed creation of Monkey's Audio (APE) files, when <strong>no</strong> meta data is being embedded</li> <li>Updated language files (big thank-you to all contributors !!!)</li> </ul> <h2 id="lamexp-v4.12-2015-10-23" class="unnumbered">LameXP v4.12 [2015-10-23]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2013 with Update-5</li> <li>Updated Qt runtime libraries to v4.8.7 Final (2015-05-25), compiled with MSVC 12.0</li> <li>Added support for building LameXP and MUtilities with Visual Studio 2015</li> <li>Added Hungarian translation, contributed by Zityi's Translator Team &lt;<script type="text/javascript">
+</script><noscript>&#x6d;&#x75;&#108;&#100;&#x65;&#114;&#50;&#32;&#x61;&#116;&#32;&#x67;&#x6d;&#120;</noscript>&gt; | <a href="http://muldersoft.com/" class="uri">http://muldersoft.com/</a></h2> </header> <nav id="TOC"> <ul> <li><a href="#lamexp-v4.xx-history"><span class="toc-section-number">1</span> LameXP v4.xx History</a><ul> <li><a href="#lamexp-v4.15-2017--">LameXP v4.15 [2017-??-??]</a></li> <li><a href="#lamexp-v4.14-2016-11-19">LameXP v4.14 [2016-11-19]</a></li> <li><a href="#lamexp-v4.13-2015-12-12">LameXP v4.13 [2015-12-12]</a></li> <li><a href="#lamexp-v4.12-2015-10-23">LameXP v4.12 [2015-10-23]</a></li> <li><a href="#lamexp-v4.11-2015-04-05">LameXP v4.11 [2015-04-05]</a></li> <li><a href="#lamexp-v4.10-2014-06-23">LameXP v4.10 [2014-06-23]</a></li> <li><a href="#lamexp-v4.09-2014-01-26">LameXP v4.09 [2014-01-26]</a></li> <li><a href="#lamexp-v4.08-2013-09-04">LameXP v4.08 [2013-09-04]</a></li> <li><a href="#lamexp-v4.07-2013-04-28">LameXP v4.07 [2013-04-28]</a></li> <li><a href="#lamexp-v4.06-2012-11-04">LameXP v4.06 [2012-11-04]</a></li> <li><a href="#lamexp-v4.05-2012-09-03">LameXP v4.05 [2012-09-03]</a></li> <li><a href="#lamexp-v4.04-2012-04-26">LameXP v4.04 [2012-04-26]</a></li> <li><a href="#lamexp-v4.03-2011-11-12">LameXP v4.03 [2011-11-12]</a></li> <li><a href="#lamexp-v4.02-2011-06-14">LameXP v4.02 [2011-06-14]</a></li> <li><a href="#lamexp-v4.01-2011-04-04">LameXP v4.01 [2011-04-04]</a></li> <li><a href="#lamexp-v4.00-2011-02-21">LameXP v4.00 [2011-02-21]</a></li> </ul></li> <li><a href="#lamexp-v3.xx-history"><span class="toc-section-number">2</span> LameXP v3.xx History</a><ul> <li><a href="#lamexp-v3.19-2010-07-12">LameXP v3.19 [2010-07-12]</a></li> <li><a href="#lamexp-v3.18-2010-05-08">LameXP v3.18 [2010-05-08]</a></li> <li><a href="#lamexp-v3.17-2010-02-21">LameXP v3.17 [2010-02-21]</a></li> <li><a href="#lamexp-v3.16-2010-01-26">LameXP v3.16 [2010-01-26]</a></li> <li><a href="#lamexp-v3.15-2009-12-24">LameXP v3.15 [2009-12-24]</a></li> <li><a href="#lamexp-v3.14-2009-12-01">LameXP v3.14 [2009-12-01]</a></li> <li><a href="#lamexp-v3.13-2009-10-21">LameXP v3.13 [2009-10-21]</a></li> <li><a href="#lamexp-v3.12-2009-09-19">LameXP v3.12 [2009-09-19]</a></li> <li><a href="#lamexp-v3.11-2009-06-22">LameXP v3.11 [2009-06-22]</a></li> <li><a href="#lamexp-v3.10-2009-06-11">LameXP v3.10 [2009-06-11]</a></li> <li><a href="#lamexp-v3.09-2009-06-01">LameXP v3.09 [2009-06-01]</a></li> <li><a href="#lamexp-v3.08-2009-03-05">LameXP v3.08 [2009-03-05]</a></li> <li><a href="#lamexp-v3.07-2008-12-24">LameXP v3.07 [2008-12-24]</a></li> <li><a href="#lamexp-v3.06-2008-10-26">LameXP v3.06 [2008-10-26]</a></li> <li><a href="#lamexp-v3.05-2008-10-11">LameXP v3.05 [2008-10-11]</a></li> <li><a href="#lamexp-v3.04-2008-09-26">LameXP v3.04 [2008-09-26]</a></li> <li><a href="#lamexp-v3.03-2008-08-12">LameXP v3.03 [2008-08-12]</a></li> <li><a href="#lamexp-v3.02-2008-08-06">LameXP v3.02 [2008-08-06]</a></li> <li><a href="#lamexp-v3.01-2008-08-01">LameXP v3.01 [2008-08-01]</a></li> <li><a href="#lamexp-v3.00-2008-07-04">LameXP v3.00 [2008-07-04]</a></li> </ul></li> <li><a href="#lamexp-v2.xx-history"><span class="toc-section-number">3</span> LameXP v2.xx History</a><ul> <li><a href="#lamexp-v2.03-2007-08-17">LameXP v2.03 [2007-08-17]</a></li> <li><a href="#lamexp-v2.00-2007-02-19">LameXP v2.00 [2007-02-19]</a></li> </ul></li> <li><a href="#lamexp-v1.xx-history"><span class="toc-section-number">4</span> LameXP v1.xx History</a><ul> <li><a href="#lamexp-v1.00-2004-12-10">LameXP v1.00 [2004-12-10]</a></li> </ul></li> </ul> </nav> <h1 id="lamexp-v4.xx-history"><span class="header-section-number">1</span> LameXP v4.xx History</h1> <h2 id="lamexp-v4.15-2017--" class="unnumbered">LameXP v4.15 [2017-??-??]</h2> <ul> <li>Fixed a bug in auto-rename feature, that caused problems when a meta-tag contained path separators</li> <li>Fixed included MediaInfo binary not working on processor <em>without</em> SSE2 support</li> <li>Improved file name generation from meta-tags containing characters that are forbidden in file names</li> <li>Some improvements for &quot;high DPI&quot; screens: Adjust initial window size according to DPI setting</li> <li>Updated Opus encoder/decoder libraries to v1.2-alpha2 (2017-03-03) and Opus-Tools to v0.1.10 (2017-02-22)</li> <li>Updated MediaInfo to v0.7.93 (2017-02-28), compiled with ICL 17.0 and MSVC 12.0</li> <li>Updated FAAD decoder to v2.7 from CVS in order to include latest libFAAD fixes (2016-11-11)</li> <li>Some tweaks to the auto-update function in order to speed-up the update check in most situations</li> </ul> <h2 id="lamexp-v4.14-2016-11-19" class="unnumbered">LameXP v4.14 [2016-11-19]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2015 with Update-3</li> <li>Fixed the location of temporary intermediate files for SoX-based audio effects</li> <li>Fixed embedding of meta tags with OggEnc2 when reading directly from OGG/FLAC input file</li> <li>Fixed encoding of <em>non</em>-Stereo sources with NeroAAC, when &quot;HE-AAC <em>v2</em> (SBR+PS)&quot; is selected</li> <li>Fixed a bug that would cause the encoding job to fail, when an audio filter is <em>skipped</em></li> <li>Enabled the &quot;built-in&quot; resampler for QAAC encoder</li> <li>The &quot;Algorithm Quality&quot; slider now also affects the QAAC encoder</li> <li>Added &quot;AVX&quot; (Advanced Vector Extensions) to CPU feature detection code</li> <li>Updated Opus encoder/decoder libraries to v1.2-alpha and Opus-Tools to v0.1.9 (2016-11-04)</li> <li>Updated LAME encoder to v3.100 Alpha-2 (2016-01-29), compiled with ICL 15.0 and MSVC 12.0</li> <li>Updated FLAC encoder/decoder to v1.3.1 (2016-10-04), compiled with ICL 17.0 and MSVC 12.0</li> <li>Updated MediaInfo to v0.7.90 (2016-10-31), compiled with ICL 17.0 and MSVC 12.0</li> <li>Updated mpg123 decoder to v1.23.8 (2016-09-27), compiled with GCC 6.2.0</li> <li>Updated ALAC decoder to refalac v1.61 (2016-10-02)</li> <li>Updated WavPack decoder to v4.80.0 (2016-03-28), compiled with ICL 15.0 and MSVC 12.0</li> <li>Updated GnuPG to v1.4.21 (2016-08-17), compiled with GCC 6.1.0</li> <li>Updated QAAC add-in to the to QAAC v2.61 (2016-10-02)</li> <li>Updated FhgAacEnc add-in to &quot;Case&quot; edition (2015-10-24)</li> <li>Improved auto-update function (faster Internet connectivity check)</li> <li>Updated language files (big thank-you to all contributors !!!)</li> </ul> <h2 id="lamexp-v4.13-2015-12-12" class="unnumbered">LameXP v4.13 [2015-12-12]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2015 with Update-1</li> <li>Apply the original file's &quot;creation&quot; and &quot;last modified&quot; date/time to the output file (optional)</li> <li>Updated Vorbis encoder to OggEnc v2.88 (2015-09-10), using libvorbis v1.3.5 and aoTuV b6.03_2015</li> <li>Updated MediaInfo to v0.7.78 (2015-10-02), compiled with ICL 15.0 and MSVC 12.0</li> <li>Fixed resampling bug with Vorbis encoder, regression in OggEnc v2.87</li> <li>Fixed creation of Monkey's Audio (APE) files, when <strong>no</strong> meta data is being embedded</li> <li>Updated language files (big thank-you to all contributors !!!)</li> </ul> <h2 id="lamexp-v4.12-2015-10-23" class="unnumbered">LameXP v4.12 [2015-10-23]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2013 with Update-5</li> <li>Updated Qt runtime libraries to v4.8.7 Final (2015-05-25), compiled with MSVC 12.0</li> <li>Added support for building LameXP and MUtilities with Visual Studio 2015</li> <li>Added Hungarian translation, contributed by Zityi's Translator Team &lt;<script type="text/javascript">
 <!--
 h='&#x67;&#x6d;&#x61;&#x69;&#108;&#46;&#x63;&#x6f;&#x6d;';a='&#64;';n='&#122;&#x69;&#116;&#x79;&#x69;&#x73;&#x6f;&#102;&#116;';e=n+a+h;
 document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'" clas'+'s="em' + 'ail">'+e+'<\/'+'a'+'>');
diff --git a/doc/Changelog.md b/doc/Changelog.md
index bec4ab28..8523b6da 100644
--- a/doc/Changelog.md
+++ b/doc/Changelog.md
@@ -8,6 +8,7 @@ LameXP Audio-Encoder Front-End &ndash; Changelog
 ## LameXP v4.15 [2017-??-??] ## {-}
 * Fixed a bug in auto-rename feature, that caused problems when a meta-tag contained path separators
 * Fixed included MediaInfo binary not working on processor *without* SSE2 support
+* Improved file name generation from meta-tags containing characters that are forbidden in file names
 * Some improvements for "high DPI" screens: Adjust initial window size according to DPI setting
 * Updated Opus encoder/decoder libraries to v1.2-alpha2 (2017-03-03) and Opus-Tools to v0.1.10 (2017-02-22)
 * Updated MediaInfo to v0.7.93 (2017-02-28), compiled with ICL 17.0 and MSVC 12.0
diff --git a/src/Config.h b/src/Config.h
index 6b3d04fa..7b3d0f47 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,7 +35,7 @@
 #define VER_LAMEXP_MINOR_LO					5
 #define VER_LAMEXP_TYPE						Beta
 #define VER_LAMEXP_PATCH					3
-#define VER_LAMEXP_BUILD					1970
+#define VER_LAMEXP_BUILD					1973
 #define VER_LAMEXP_CONFG					1934
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index 8ebbbde3..bd9d044e 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -3012,7 +3012,7 @@ void MainWindow::makeFolderButtonClicked(void)
 {
 	ABORT_IF_BUSY;
 
-	if(!m_fileSystemModel)
+	if(m_fileSystemModel.isNull())
 	{
 		qWarning("File system model not initialized yet!");
 		return;
@@ -3031,7 +3031,7 @@ void MainWindow::makeFolderButtonClicked(void)
 	}
 	else if(!m_metaData->album().isEmpty())
 	{
-		suggestedName =m_metaData->album();
+		suggestedName = m_metaData->album();
 	}
 	else
 	{
@@ -3059,7 +3059,7 @@ void MainWindow::makeFolderButtonClicked(void)
 		}
 	}
 	
-	suggestedName = MUtils::clean_file_name(suggestedName);
+	suggestedName = MUtils::clean_file_name(suggestedName, true);
 
 	while(true)
 	{
@@ -3068,7 +3068,7 @@ void MainWindow::makeFolderButtonClicked(void)
 
 		if(bApplied)
 		{
-			folderName = MUtils::clean_file_path(folderName.simplified());
+			folderName = MUtils::clean_file_path(folderName.simplified(), true);
 
 			if(folderName.isEmpty())
 			{
@@ -4039,7 +4039,7 @@ void MainWindow::renameOutputPatternChanged(const QString &text, const bool &sil
 	pattern.replace("<Year>", "2001", Qt::CaseInsensitive);
 	pattern.replace("<Comment>", "Encoded by LameXP", Qt::CaseInsensitive);
 
-	const QString patternClean = MUtils::clean_file_name(pattern);
+	const QString patternClean = MUtils::clean_file_name(pattern, false);
 
 	if(pattern.compare(patternClean))
 	{
@@ -4131,7 +4131,7 @@ void  MainWindow::renameRegExpReplaceChanged(const QString &text, const bool &si
 		}
 	}
 
-	if(replacement.compare(MUtils::clean_file_name(replacement)))
+	if(replacement.compare(MUtils::clean_file_name(replacement, false)))
 	{
 		if(ui->lineEditRenameRegExp_Replace->palette().color(QPalette::Text) != Qt::red)
 		{
diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp
index fe5a81a4..15fdf3bf 100644
--- a/src/Dialog_Processing.cpp
+++ b/src/Dialog_Processing.cpp
@@ -985,7 +985,7 @@ void ProcessingDialog::writePlayList(void)
 	}
 
 	//Clean playlist name
-	playListName = MUtils::clean_file_name(playListName);
+	playListName = MUtils::clean_file_name(playListName, true);
 
 	//Create list of audio files
 	for(int i = 0; i < m_allJobs.count(); i++)
diff --git a/src/Thread_CueSplitter.cpp b/src/Thread_CueSplitter.cpp
index 927ffdac..3aebeedb 100644
--- a/src/Thread_CueSplitter.cpp
+++ b/src/Thread_CueSplitter.cpp
@@ -208,10 +208,10 @@ void CueSplitter::run()
 
 			//Generate output file name
 			QString trackTitle = trackMetaInfo.title().isEmpty() ? QString().sprintf("Track %02d", trackNo) : trackMetaInfo.title();
-			QString outputFile = QString("%1/[%2] %3 - %4.wav").arg(m_outputDir, QString().sprintf("%02d", trackNo), MUtils::clean_file_name(m_baseName), MUtils::clean_file_name(trackTitle));
+			QString outputFile = QString("%1/[%2] %3 - %4.wav").arg(m_outputDir, QString().sprintf("%02d", trackNo), MUtils::clean_file_name(m_baseName, true), MUtils::clean_file_name(trackTitle, true));
 			for(int n = 2; QFileInfo(outputFile).exists(); n++)
 			{
-				outputFile = QString("%1/[%2] %3 - %4 (%5).wav").arg(m_outputDir, QString().sprintf("%02d", trackNo), MUtils::clean_file_name(m_baseName), MUtils::clean_file_name(trackTitle), QString::number(n));
+				outputFile = QString("%1/[%2] %3 - %4 (%5).wav").arg(m_outputDir, QString().sprintf("%02d", trackNo), MUtils::clean_file_name(m_baseName, true), MUtils::clean_file_name(trackTitle, true), QString::number(n));
 			}
 
 			//Call split function
diff --git a/src/Thread_Process.cpp b/src/Thread_Process.cpp
index 7eeaca6a..e315094e 100644
--- a/src/Thread_Process.cpp
+++ b/src/Thread_Process.cpp
@@ -420,7 +420,7 @@ int ProcessThread::generateOutFileName(QString &outFileName)
 	}
 
 	const QString baseName = sourceFile.completeBaseName();
-	QDir targetDir(MUtils::clean_file_path(m_outputDirectory.isEmpty() ? sourceFile.canonicalPath() : m_outputDirectory));
+	QDir targetDir(MUtils::clean_file_path(m_outputDirectory.isEmpty() ? sourceFile.canonicalPath() : m_outputDirectory, false));
 
 	//Prepend relative source file path?
 	if(m_prependRelativeSourcePath && !m_outputDirectory.isEmpty())
@@ -434,7 +434,7 @@ int ProcessThread::generateOutFileName(QString &outFileName)
 				if (!sourceDir.cdUp()) break;
 			}
 			const QString postfix = QFileInfo(sourceDir.relativeFilePath(sourceFile.canonicalFilePath())).path();
-			targetDir.setPath(MUtils::clean_file_path(QString("%1/%2").arg(targetDir.absolutePath(), postfix)));
+			targetDir.setPath(MUtils::clean_file_path(QString("%1/%2").arg(targetDir.absolutePath(), postfix), false));
 		}
 	}
 	
@@ -462,7 +462,7 @@ int ProcessThread::generateOutFileName(QString &outFileName)
 	}
 
 	//Apply rename pattern
-	const QString fileName = MUtils::clean_file_name(applyRegularExpression(applyRenamePattern(baseName, m_audioFile.metaInfo())));
+	const QString fileName = MUtils::clean_file_name(applyRegularExpression(applyRenamePattern(baseName, m_audioFile.metaInfo())), true);
 
 	//Generate full output path
 	const QString fileExt = m_renameFileExt.isEmpty() ? QString::fromUtf8(m_encoder->toEncoderInfo()->extension()) : m_renameFileExt;
@@ -742,7 +742,7 @@ void ProcessThread::setRenameRegExp(const QString &search, const QString &replac
 
 void ProcessThread::setRenameFileExt(const QString &fileExtension)
 {
-	m_renameFileExt = MUtils::clean_file_name(fileExtension).simplified();
+	m_renameFileExt = MUtils::clean_file_name(fileExtension, false).simplified();
 	while(m_renameFileExt.startsWith('.'))
 	{
 		m_renameFileExt = m_renameFileExt.mid(1).trimmed();