summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Swift/QtUI/QtSwift.cpp2
-rw-r--r--Swiften/MUC/MUC.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index e84f9cf..183f64d 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -251,10 +251,10 @@ QtSwift::~QtSwift() {
delete tray;
}
delete tabs_;
+ delete splitter_;
delete settingsHierachy_;
delete qtSettings_;
delete xmlSettings_;
- delete splitter_;
delete statusCache_;
delete uriHandler_;
delete dock_;
diff --git a/Swiften/MUC/MUC.cpp b/Swiften/MUC/MUC.cpp
index ff26c86..f85cf8d 100644
--- a/Swiften/MUC/MUC.cpp
+++ b/Swiften/MUC/MUC.cpp
@@ -175,8 +175,8 @@ void MUC::handleIncomingPresence(Presence::ref presence) {
std::map<std::string,MUCOccupant>::iterator i = occupants.find(nick);
if (i != occupants.end()) {
//TODO: part type
- occupants.erase(i);
MUCOccupant occupant = i->second;
+ occupants.erase(i);
onOccupantLeft(occupant, type, "");
}
}