From 5c603ee98b35efd24b2233ba8249143d186e323d Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 27 Apr 2012 13:11:07 +0200 Subject: [PATCH] Bugfix for deleting delegates. --- base/event.h | 11 +++++------ components/demo/demo.vcxproj.filters | 10 ++++++++++ jsonrpc/jsonrpc.vcxproj.filters | 20 ++++++++++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 components/demo/demo.vcxproj.filters create mode 100644 jsonrpc/jsonrpc.vcxproj.filters diff --git a/base/event.h b/base/event.h index 725b4a03f..9628142af 100644 --- a/base/event.h +++ b/base/event.h @@ -33,16 +33,15 @@ public: void operator()(const TArgs& args) { - typename vector::iterator prev, i; + typename vector::iterator i; for (i = m_Delegates.begin(); i != m_Delegates.end(); ) { - prev = i; - i++; - - int result = (*prev)(args); + int result = (*i)(args); if (result == -1) - m_Delegates.erase(prev); + i = m_Delegates.erase(i); + else + i++; } } }; diff --git a/components/demo/demo.vcxproj.filters b/components/demo/demo.vcxproj.filters new file mode 100644 index 000000000..51b6a0536 --- /dev/null +++ b/components/demo/demo.vcxproj.filters @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/jsonrpc/jsonrpc.vcxproj.filters b/jsonrpc/jsonrpc.vcxproj.filters new file mode 100644 index 000000000..6e33d2942 --- /dev/null +++ b/jsonrpc/jsonrpc.vcxproj.filters @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- 2.40.0