From 1aa7c1ee426e6fffc19f66ce67f57d07070b6c2f Mon Sep 17 00:00:00 2001 From: Chris Frey Date: Tue, 1 May 2012 19:01:55 -0400 Subject: [PATCH] gui: fixed bug that displayed error msg based on wrong set of databases When the backup detects that a different number of records were backed up than expected, it displays the databases that actually had differing records. In the case where "Backup All Databases" was selected, and none other checkboxes were checked, this message showed an empty list. This commit fixes that. --- gui/src/Thread.cc | 12 ++++++++++++ gui/src/Thread.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gui/src/Thread.cc b/gui/src/Thread.cc index 66a7eb4b..2d80244f 100644 --- a/gui/src/Thread.cc +++ b/gui/src/Thread.cc @@ -72,6 +72,18 @@ bool Thread::CheckFinishedMarker() return true; } +std::vector Thread::CompareTotals() const +{ + if( AutoSelectAll() ) { + // compare against full DBDB + return m_interface.CompareTotals(m_interface.GetDBDB()); + } + else { + // compare against current saved backup list + return m_interface.CompareTotals(GetBackupList()); + } +} + std::string Thread::GetFullname() { std::string ret = GetPIN().Str() + " (" + GetDeviceName() + ")"; diff --git a/gui/src/Thread.h b/gui/src/Thread.h index 1322677e..e305583d 100644 --- a/gui/src/Thread.h +++ b/gui/src/Thread.h @@ -99,7 +99,7 @@ public: unsigned int GetRecordFinished() const { return m_recordFinished; } unsigned int GetRecordTotal() const { return m_recordTotal; } unsigned int GetThreadState() const { return m_thread_state; } - std::vector CompareTotals() const { return m_interface.CompareTotals(GetBackupList()); } + std::vector CompareTotals() const; void Reset() { m_interface.Reset(); } bool Connect(); -- 2.11.4.GIT