From 1cefa3f0c0f3446d493ef534d34126544d211031 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Sat, 2 Feb 2008 19:30:33 +0000 Subject: [PATCH 1/1] Stopped Quassel from Segfaulting on 2nd+ connect to cores. !slap Sput --- src/qtui/mainwin.cpp | 14 ++++++++------ version.inc | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index c0b61108..2d980dcf 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -349,7 +349,6 @@ void MainWin::clientNetworkCreated(NetworkId id) { foreach(QAction *a, networkActions) ui.menuNetworks->addAction(a); ui.menuNetworks->addSeparator(); ui.menuNetworks->addAction(actionEditNetworks); - } void MainWin::clientNetworkUpdated() { @@ -374,11 +373,14 @@ void MainWin::clientNetworkUpdated() { } void MainWin::clientNetworkRemoved(NetworkId id) { - foreach(QAction *a, networkActions) { - if(a->data().value() == id) { - a->deleteLater(); - break; - } + QList::iterator actionIter = networkActions.begin();; + QAction *action; + while(actionIter != networkActions.end()) { + action = *actionIter; + if(action->data().value() == id) + actionIter = networkActions.erase(actionIter); + else + actionIter++; } } diff --git a/version.inc b/version.inc index 27cb7925..05c6e71f 100644 --- a/version.inc +++ b/version.inc @@ -5,7 +5,7 @@ quasselVersion = "0.2.0-pre"; quasselDate = "2008-02-02"; - quasselBuild = 439; + quasselBuild = 440; //! Minimum client build number the core needs clientBuildNeeded = 435; -- 2.20.1