X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmodelpropertymapper.cpp;h=2e3b100ffe68660c24fe843d12a98769fa29cecf;hp=a855568f404bb7fa82f7e0c99fddf33aa15f98da;hb=46d75f41de7c1aaee605c096da28d4b0d8abf138;hpb=6623fd2d46dadd0168e4e28d1db6944c26c2a773

diff --git a/src/client/modelpropertymapper.cpp b/src/client/modelpropertymapper.cpp
index a855568f..2e3b100f 100644
--- a/src/client/modelpropertymapper.cpp
+++ b/src/client/modelpropertymapper.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -81,10 +81,12 @@ void ModelPropertyMapper::removeMapping(int column, int role, QObject *target, c
   }
   
   if(column == 0 && role == 0 && !property.isNull()) {
-    QList<Mapping>::iterator iter;
-    for(iter = _mappings.begin(); iter != _mappings.end(); iter++) {
+    QList<Mapping>::iterator iter = _mappings.begin();
+    while(iter != _mappings.end()) {
       if((*iter).target == target)
-	_mappings.erase(iter);
+	iter = _mappings.erase(iter);
+      else
+	iter++;
     }
     return;
   }