Some improvements and simplifications to error handling functions.

[lamexp/LameXP.git] / src / Thread_DiskObserver.cpp

diff --git a/src/Thread_DiskObserver.cpp b/src/Thread_DiskObserver.cpp
index 266f666..b5efa81 100644 (file)
--- a/src/Thread_DiskObserver.cpp
+++ b/src/Thread_DiskObserver.cpp
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// (at your option) any later version, but always including the *additional*
+// restrictions defined in the "License.txt" file.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,6 +23,7 @@
 #include "Thread_DiskObserver.h"
 
 #include "Global.h"
+#include "Model_Progress.h"
 
 #include <QDir>
 
@@ -53,13 +55,15 @@ void DiskObserverThread::run(void)
        {
                observe();
        }
+       catch(const std::exception &error)
+       {
+               PRINT_ERROR("\nGURU MEDITATION !!!\n\nException error:\n%s\n", error.what());
+               lamexp_fatal_exit("Unhandeled C++ exception error, application will exit!");
+       }
        catch(...)
        {
-               fflush(stdout);
-               fflush(stderr);
-               fprintf(stderr, "\nGURU MEDITATION !!!\n");
-               FatalAppExit(0, L"Unhandeled exception error, application will exit!");
-               TerminateProcess(GetCurrentProcess(), -1);
+               PRINT_ERROR("\nGURU MEDITATION !!!\n\nUnknown exception error!\n");
+               lamexp_fatal_exit("Unhandeled C++ exception error, application will exit!");
        }
 
        while(m_semaphore.available()) m_semaphore.tryAcquire();
@@ -78,8 +82,8 @@ void DiskObserverThread::observe(void)
                {
                        if(freeSpace < minimumSpace)
                        {
-                               qWarning("Free diskspace on '%s' dropped below %s MB, only %s MB free!", m_path.toUtf8().constData(), QString::number(minimumSpace / 1048576ui64).toUtf8().constData(), QString::number(freeSpace / 1048576ui64).toUtf8().constData());
-                               emit messageLogged(tr("Low diskspace on drive '%1' detected (only %2 MB are free), problems can occur!").arg(QDir::toNativeSeparators(m_path), QString::number(freeSpace / 1048576ui64)), true);
+                               qWarning("Free diskspace on '%s' dropped below %s MB, only %s MB free!", QUTF8(m_path), QUTF8(QString::number(minimumSpace / 1048576ui64)), QUTF8(QString::number(freeSpace / 1048576ui64)));
+                               emit messageLogged(tr("Low diskspace on drive '%1' detected (only %2 MB are free), problems can occur!").arg(QDir::toNativeSeparators(m_path), QString::number(freeSpace / 1048576ui64)), ProgressModel::SysMsg_Warning);
                                minimumSpace = qMin(freeSpace, (minimumSpace >> 1));
                        }
                        if(freeSpace != previousSpace)