From 4e04f6e51df0dc9f09366f3371def090a26fa5f0 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Tue, 26 Jun 2018 15:00:51 -0700 Subject: [PATCH] Don't warn about an invalid date if it's just an empty column. --- libgnucash/backend/sql/gnc-sql-column-table-entry.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libgnucash/backend/sql/gnc-sql-column-table-entry.cpp b/libgnucash/backend/sql/gnc-sql-column-table-entry.cpp index 63a4f7ae81..6daed1d416 100644 --- a/libgnucash/backend/sql/gnc-sql-column-table-entry.cpp +++ b/libgnucash/backend/sql/gnc-sql-column-table-entry.cpp @@ -399,10 +399,14 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, GncDateTime time(val); ts.tv_sec = static_cast(time); } - catch (std::invalid_argument&) + catch (const std::invalid_argument& err) { - PWARN("An invalid date was found in your database." - "It has been set to 1 January 1970."); + if (strcmp(err.what(), "Column empty.") != 0) + { + auto val = row.get_string_at_col(m_col_name); + PWARN("An invalid date %s was found in your database." + "It has been set to 1 January 1970.", val.c_str()); + } ts.tv_sec = 0; } }