From 8a44c872725f468a593aa892dab5282ead38798d Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Thu, 24 Nov 2011 16:45:04 +0000 Subject: [PATCH] Don't require CTimer's label to be unique if its empty (Fixes #92) --- src/Modules.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Modules.cpp b/src/Modules.cpp index 668ac6b3..a21c936e 100644 --- a/src/Modules.cpp +++ b/src/Modules.cpp @@ -233,7 +233,7 @@ bool CModule::ClearNV(bool bWriteToDisk) { } bool CModule::AddTimer(CTimer* pTimer) { - if ((!pTimer) || (FindTimer(pTimer->GetName()))) { + if ((!pTimer) || (!pTimer->GetName().empty() && FindTimer(pTimer->GetName()))) { delete pTimer; return false; } @@ -280,6 +280,10 @@ bool CModule::UnlinkTimer(CTimer* pTimer) { } CTimer* CModule::FindTimer(const CString& sLabel) { + if (sLabel.empty()) { + return NULL; + } + set::iterator it; for (it = m_sTimers.begin(); it != m_sTimers.end(); ++it) { CTimer* pTimer = *it;