From b91a6537411cad3662bc5d038503d86b3f0febf8 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 28 Jun 2005 05:48:41 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=6468 --- checkin_notes | 2 +- clientgui/MainDocument.cpp | 4 +++- db/db_base.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/checkin_notes b/checkin_notes index 03fab82f60..afcfd97840 100755 --- a/checkin_notes +++ b/checkin_notes @@ -8599,7 +8599,7 @@ David 27 June 2005 if you're going to use a "like X" clause, call this function to escape the non-wildcard part of X. If it contains wildcard chars (%, _) this will put - two (2) underscores before each one, + two (2) backslashes before each one, so that they don't get treated as wildcards - use the above function in sched_locality.C so that filename chars and our own __ separators diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp index cc66874f27..a293137e72 100644 --- a/clientgui/MainDocument.cpp +++ b/clientgui/MainDocument.cpp @@ -826,6 +826,7 @@ int CMainDocument::WorkAbort(int iIndex) { int CMainDocument::CachedMessageUpdate() { int retval; static bool in_this_func = false; + int new_msg_seqno; if (in_this_func) return 0; in_this_func = true; @@ -846,7 +847,7 @@ int CMainDocument::CachedMessageUpdate() { std::vector::iterator mi = new_msgs.messages.begin(); while (mi != new_msgs.messages.end()) { MESSAGE* mp = *mi; - m_iMessageSequenceNumber = mp->seqno; + new_msg_seqno = mp->seqno; switch(mp->priority) { case MSG_PRIORITY_ALERT_ERROR: if (m_iMessageSequenceNumber) { @@ -873,6 +874,7 @@ int CMainDocument::CachedMessageUpdate() { } new_msgs.messages.erase(mi); } + m_iMessageSequenceNumber = new_msg_seqno; } done: in_this_func = false; diff --git a/db/db_base.h b/db/db_base.h index 272c6f493b..1124e9c875 100644 --- a/db/db_base.h +++ b/db/db_base.h @@ -120,7 +120,7 @@ void escape_mysql_like_pattern(const char* in, char* out); // if you're going to use a "like X" clause, // call this function to escape the non-wildcard part of X. // If it contains wildcard chars (%, _) this will put - // two (2) underscores before each one, + // two (2) backslashes before each one, // so that they don't get treated as wildcards #endif