diff --git a/doc/FAQ.html b/doc/FAQ.html
index c5230075..04285dd6 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -109,6 +109,67 @@ Please see the free software, so may use it for free and for any purpose. Moreover the authors of LameXP currently
+do NOT accept any donations. Therefore you should NOT pay or donate any money in order to obtain LameXP!
+However it was brought to our attention that some dubious thrid-party web-sites offer "payed" downloads of
+LameXP and/or include Adware into the LameXP download. We do NOT cooperate with any of these sites. So if you
+pay for the LameXP download, the authors of LameXP will not get a single cent! Instead you should save your
+money download LameXP from one of the "official" mirrors (see below), which is 100% free.
+
+If you want to support the development of LameXP, you can do so by contributing translations and/or code :-)
+
+
+
+How do I enable AAC/MP4/M4A output (encoding) in LameXP?
+
+LameXP uses the Nero AAC Encoder for creating AAC/MP4/M4A files. The Nero AAC Encoder is available as a free
+download. However the license doesn't allow redistribution! Therefore we can NOT ship the Nero encoder along
+with LameXP. Instead you will have to obtain the Nero encoder as a separate download from the official "Nero
+Digital" web-site. Currently you'll find the latest Nero AAC Encoder version at this location:
+
+After you have downloaded the Nero AAC Encoder as a ZIP file, you must "install" the encoder binaires, so
+LameXP can use them. Simply unzip the files 'neroAacEnc.exe', 'neroAacDec.exe' as well as 'neroAacTag.exe' to
+the same directory where your LameXP executable ('LameXP.exe') is located. For unzipping the ZIP file you can
+use any suitable archiver, such as WinRAR or 7-Zip. Once the required Nero encoder binaries are located in
+the LameXP directory, the AAC encoding option should be "enabled" on the next startup of LameXP.
+
+
+
+Is there a way to output ".aac" or ".m4a" files with LameXP?
+
+LameXP uses the Nero AAC Encoder for AAC encoding. And the Nero encoder always puts the AAC streams into an
+MP4 (MPEG-4 Part 14) container - in almost any case that is exactly what you want/need! The one and only
+"correct" file extension for MP4 files is '.mp4'. However sometimes the "incorrect" file extension '.m4a' is
+used to indicate "audio-only" MP4 files. Even worse: There are some buggy (hardware) players that will
+recognize MP4 audio file only with the "incorrect" .m4a extension, but NOT with the "correct" .mp4 extension.
+Of course LameXP will save your MP4 files with the "correct" .mp4 extension. But if you need your MP4 files
+with an .m4a extension for some reason, you can simply rename(!) these files. This isn't more or less
+"incorrect" than saving the files with an .m4a directly. After all, an MP4 file remains an MP4 file.
+
+Having said that, you should NOT rename any .mp4 or .m4a files to .aac, because these are MP4 files and NOT
+"raw" AAC streams. The Nero AAC encoder has NO option to output "raw" AAC streams and usually you don't need
+such streams. Still, if you want to extract the "raw" AAC stream from an MP4 file you can use MP4Box.
+
+
+
+How do I enable WMA input (decoding) in LameXP?
+
+WMA input requires the WMA decoder component to be installed on your local computer. Usually LameXP will show
+a warning on startup, if the WMA decoder component could not be found. In that case you can simply choose
+"Download & Install" in order to install the WMA decoder component on your system. Alternatively you can
+also install the WMA decoder component manually by choosing "Install WMA Decoder" from the "Tools" menu. In
+any case you must restart LameXP after the WMA decoder component has been installed.
+
+It has to be noted that the WMA decoder component relies on the Windows Media Format Runtime. All supported
+versions of Microsoft Windows should have the Windows Media Format Runtime installed out of the box. However
+Wine does not! In case you encounter problems with the WMA decoder component, try downloading and installing
+the Windows Media Format 11 Runtime manually. This should also work under Linux/Wine.
+
+
+
How can I use LameXP as a "portable" application?
LameXP always is "portable", in the sense that the application works out of the box: LameXP does NOT require
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index 3baa1097..2dbff3e9 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -1486,14 +1486,17 @@ void MainWindow::visitHomepageActionActivated(void)
void MainWindow::checkUpdatesActionActivated(void)
{
ABORT_IF_BUSY;
-
+ bool bFlag = false;
+
TEMP_HIDE_DROPBOX
(
- if(checkForUpdates())
- {
- QApplication::quit();
- }
+ bFlag = checkForUpdates();
)
+
+ if(bFlag)
+ {
+ QApplication::quit();
+ }
}
/*