Added Qt5 support, contributed by John Buonagurio <jbuonagurio@exponent.com>.

[mutilities/MUtilities.git] / src / ErrorHandler_Win32.cpp

diff --git a/src/ErrorHandler_Win32.cpp b/src/ErrorHandler_Win32.cpp
index 7a4222e..4d881b4 100644 (file)
--- a/src/ErrorHandler_Win32.cpp
+++ b/src/ErrorHandler_Win32.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // MuldeR's Utilities for Qt
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2016 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,8 +19,6 @@
 // http://www.gnu.org/licenses/lgpl-2.1.txt
 //////////////////////////////////////////////////////////////////////////////////
 
-#pragma once
-
 //MUtils
 #include <MUtils/ErrorHandler.h>
 #include <MUtils/OSSupport.h>
@@ -66,6 +64,7 @@ void MUtils::ErrorHandler::initialize(void)
        SetUnhandledExceptionFilter(my_exception_handler);
        SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL);
        _set_invalid_parameter_handler(my_invalid_param_handler);
+       SetDllDirectoryW(L""); /*don'tload DLL from "current" directory*/
        
        static const int signal_num[6] = { SIGABRT, SIGFPE, SIGILL, SIGINT, SIGSEGV, SIGTERM };
 
@@ -73,6 +72,7 @@ void MUtils::ErrorHandler::initialize(void)
        {
                signal(signal_num[i], my_signal_handler);
        }
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////