diff --git a/resources/report/js/script.js b/resources/report/js/script.js
index c541a18c..2f7f5bae 100644
--- a/resources/report/js/script.js
+++ b/resources/report/js/script.js
@@ -196,7 +196,7 @@ var loot = {
gameSelect.value = this.settings.game;
document.getElementById('languageSelect').value = this.settings.language;
- document.getElementById('debugVerbositySelect').value = this.settings.debugVerbosity;
+ document.getElementById('enableDebugLogging').checked = this.settings.enableDebugLogging;
document.getElementById('updateMasterlist').checked = this.settings.updateMasterlist;
this.updateEnabledGames();
@@ -1032,7 +1032,7 @@ function closeSettingsDialog(evt) {
if (evt.target.classList.contains('accept')) {
/* Update the JS variable values. */
var settings = {
- debugVerbosity: document.getElementById('debugVerbositySelect').value,
+ enableDebugLogging: document.getElementById('enableDebugLogging').checked,
game: document.getElementById('defaultGameSelect').value,
games: document.getElementById('gameTable').getRowsData(false),
language: document.getElementById('languageSelect').value,
diff --git a/resources/report/report.html b/resources/report/report.html
index 3d62a37c..f3af7254 100644
--- a/resources/report/report.html
+++ b/resources/report/report.html
@@ -541,13 +541,8 @@ along with LOOT. If not, see <http://www.gnu.org/licenses/>.
-
-
+
+
-
Language changes will be applied after LOOT is restarted.
diff --git a/src/gui/app.cpp b/src/gui/app.cpp
index b2b29b74..471a48e6 100644
--- a/src/gui/app.cpp
+++ b/src/gui/app.cpp
@@ -160,29 +160,21 @@ namespace loot {
boost::log::keywords::file_name = g_path_log.string().c_str(),
boost::log::keywords::auto_flush = true,
boost::log::keywords::format = (
- boost::log::expressions::stream
- << "[" << boost::log::expressions::format_date_time< boost::posix_time::ptime >("TimeStamp", "%H:%M:%S") << "]"
- << " [" << boost::log::trivial::severity << "]: "
- << boost::log::expressions::smessage
+ boost::log::expressions::stream
+ << "[" << boost::log::expressions::format_date_time< boost::posix_time::ptime >("TimeStamp", "%H:%M:%S") << "]"
+ << " [" << boost::log::trivial::severity << "]: "
+ << boost::log::expressions::smessage
)
- );
+ );
boost::log::add_common_attributes();
- unsigned int verbosity;
- if (_settings["debugVerbosity"]) {
- verbosity = _settings["debugVerbosity"].as();
+ bool enableDebugLogging = false;
+ if (_settings["enableDebugLogging"]) {
+ enableDebugLogging = _settings["enableDebugLogging"].as();
}
- if (verbosity == 0)
- boost::log::core::get()->set_logging_enabled(false);
- else {
+ if (enableDebugLogging)
boost::log::core::get()->set_logging_enabled(true);
-
- if (verbosity == 1)
- boost::log::core::get()->set_filter(boost::log::trivial::severity >= boost::log::trivial::warning); //Log all warnings, errors and fatals.
- else if (verbosity == 2)
- boost::log::core::get()->set_filter(boost::log::trivial::severity >= boost::log::trivial::debug); //Log debugs, infos, warnings, errors and fatals.
- else
- boost::log::core::get()->set_filter(boost::log::trivial::severity >= boost::log::trivial::trace); //Log everything.
- }
+ else
+ boost::log::core::get()->set_logging_enabled(false);
BOOST_LOG_TRIVIAL(info) << "LOOT Version: " << g_version_major << "." << g_version_minor << "." << g_version_patch;
// The CEF debug log is appended to, not overwritten, so it gets really long.
@@ -350,10 +342,10 @@ namespace loot {
else
return false;
}
- if (!_settings["debugVerbosity"]) {
+ if (!_settings["enableDebugLogging"]) {
if (_settings["Debug Verbosity"]) {
// Conversion from 0.6 key.
- _settings["debugVerbosity"] = _settings["Debug Verbosity"];
+ _settings["enableDebugLogging"] = (_settings["Debug Verbosity"].as() > 0);
_settings.remove("Debug Verbosity");
}
else
@@ -398,7 +390,7 @@ namespace loot {
root["language"] = "en";
root["game"] = "auto";
root["lastGame"] = "auto";
- root["debugVerbosity"] = 0;
+ root["enableDebugLogging"] = false;
root["updateMasterlist"] = true;
std::vector games;