[Lemon-commits] Balazs Dezso: Fix ImmediateDetach in AlterationO...

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/af4e8ba94294
changeset: 230:af4e8ba94294
user:      Balazs Dezso <deba [at] inf.elte.hu>
date:      Wed Jul 23 15:24:52 2008 +0200
description:
	Fix ImmediateDetach in AlterationObserver (ticket #130)

diffstat:

1 file changed, 3 insertions(+), 3 deletions(-)
lemon/bits/alteration_notifier.h |    6 +++---

diffs (36 lines):

diff -r b6732e0d38c5 -r af4e8ba94294 lemon/bits/alteration_notifier.h
--- a/lemon/bits/alteration_notifier.h	Mon Jul 21 16:30:28 2008 +0200
+++ b/lemon/bits/alteration_notifier.h	Wed Jul 23 15:24:52 2008 +0200
@@ -409,9 +409,9 @@
           (*it)->erase(item);
           ++it;
         } catch (const ImmediateDetach&) {
-          it = _observers.erase(it);
           (*it)->_index = _observers.end();
           (*it)->_notifier = 0;
+          it = _observers.erase(it);
         }
       }
     }
@@ -429,9 +429,9 @@
           (*it)->erase(items);
           ++it;
         } catch (const ImmediateDetach&) {
-          it = _observers.erase(it);
           (*it)->_index = _observers.end();
           (*it)->_notifier = 0;
+          it = _observers.erase(it);
         }
       }
     }
@@ -468,9 +468,9 @@
           (*it)->clear();
           ++it;
         } catch (const ImmediateDetach&) {
-          it = _observers.erase(it);
           (*it)->_index = _observers.end();
           (*it)->_notifier = 0;
+          it = _observers.erase(it);
         }
       }
     }