fixing wrong usage of QList::erase(QList::iterator) (also for QHash)

[quassel.git] / src / qtui / settingspages / bufferviewsettingspage.cpp

diff --git a/src/qtui/settingspages/bufferviewsettingspage.cpp b/src/qtui/settingspages/bufferviewsettingspage.cpp
index f0a8230..76e461e 100644 (file)
--- a/src/qtui/settingspages/bufferviewsettingspage.cpp
+++ b/src/qtui/settingspages/bufferviewsettingspage.cpp
@@ -350,10 +350,11 @@ void BufferViewSettingsPage::on_deleteBufferView_clicked() {
       QList<BufferViewConfig *>::iterator iter = _newBufferViews.begin();
       while(iter != _newBufferViews.end()) {
        if(*iter == config) {
       QList<BufferViewConfig *>::iterator iter = _newBufferViews.begin();
       while(iter != _newBufferViews.end()) {
        if(*iter == config) {

-         _newBufferViews.erase(iter);
+         iter = _newBufferViews.erase(iter);

          break;
          break;

+       } else {
+         iter++;

        }
        }

-       iter++;

       }
       delete config;
       if(_deleteBufferViews.isEmpty() && _changedBufferViews.isEmpty() && _newBufferViews.isEmpty())
       }
       delete config;
       if(_deleteBufferViews.isEmpty() && _changedBufferViews.isEmpty() && _newBufferViews.isEmpty())


@@ -463,7 +464,7 @@ bool BufferViewSettingsPage::testHasChanged() {
   while(iter != iterEnd) {
     if(&(iter.key()) == &(iter.value())) {
       iter.value()->deleteLater();
   while(iter != iterEnd) {
     if(&(iter.key()) == &(iter.value())) {
       iter.value()->deleteLater();

-      _changedBufferViews.erase(iter);
+      iter = _changedBufferViews.erase(iter);

     } else {
       changed = true;
       iter++;
     } else {
       changed = true;
       iter++;