24 lines
1.0 KiB
Diff
Executable File
24 lines
1.0 KiB
Diff
Executable File
--- src/log4qt/logmanager.cpp.orig 2018-01-08 08:23:00.303262244 +0100
|
|
+++ src/log4qt/logmanager.cpp 2018-01-08 08:23:19.259410697 +0100
|
|
@@ -291,7 +291,7 @@
|
|
|
|
// Configuration using setting Configuration
|
|
value = InitialisationHelper::setting(QLatin1String("Configuration"));
|
|
- if (QFile::exists(value))
|
|
+ if (!value.isEmpty() && QFile::exists(value))
|
|
{
|
|
static_logger()->debug("Default initialisation configures from file '%1' specified by Configure", value);
|
|
PropertyConfigurator::configure(value);
|
|
--- src/log4qt/helpers/configuratorhelper.cpp.orig 2018-01-15 12:44:43.783689106 +0100
|
|
+++ src/log4qt/helpers/configuratorhelper.cpp 2018-01-15 12:45:20.787982755 +0100
|
|
@@ -83,7 +83,8 @@
|
|
mConfigurationFile.setFile(rFileName);
|
|
mpConfigureFunc = nullptr;
|
|
delete mpConfigurationFileWatch;
|
|
- if (!QFileInfo::exists(rFileName))
|
|
+ mpConfigurationFileWatch = nullptr;
|
|
+ if (rFileName.isEmpty() || !QFileInfo::exists(rFileName))
|
|
return;
|
|
|
|
mpConfigureFunc = pConfigureFunc;
|