Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-10-10 19:05:17 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-10-10 19:05:17 (GMT) |
| commit | d0bb6fb5a3b58d04a68deabd8d4431b112c6c084 (patch) | |
| tree | 0893cc9d19ac677ac92293e0764b0a3fa4c0cafb | |
| parent | 815af99155f7f59fb4e43d75e271a5061706449b (diff) | |
| download | swift-d0bb6fb5a3b58d04a68deabd8d4431b112c6c084.zip swift-d0bb6fb5a3b58d04a68deabd8d4431b112c6c084.tar.bz2 | |
Fix a crash when signing out.
Release-Notes: Don't crash when signing out.
| -rw-r--r-- | Swift/Controllers/EventWindowController.cpp | 3 | ||||
| -rw-r--r-- | Swift/QtUI/EventViewer/QtEventWindow.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/EventViewer/QtEventWindow.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Swift/Controllers/EventWindowController.cpp b/Swift/Controllers/EventWindowController.cpp index fcafec9..a8c8f11 100644 --- a/Swift/Controllers/EventWindowController.cpp +++ b/Swift/Controllers/EventWindowController.cpp @@ -18,7 +18,8 @@ EventWindowController::EventWindowController(EventController* eventController, E } EventWindowController::~EventWindowController() { - delete window_; + // Don't delete this, since Qt owns it + //delete window_; } void EventWindowController::handleEventQueueEventAdded(boost::shared_ptr<StanzaEvent> event) { diff --git a/Swift/QtUI/EventViewer/QtEventWindow.cpp b/Swift/QtUI/EventViewer/QtEventWindow.cpp index b56ee78..5200740 100644 --- a/Swift/QtUI/EventViewer/QtEventWindow.cpp +++ b/Swift/QtUI/EventViewer/QtEventWindow.cpp @@ -23,7 +23,7 @@ namespace Swift { -QtEventWindow::QtEventWindow(UIEventStream* eventStream, QWidget* parent) : QWidget(parent) { +QtEventWindow::QtEventWindow(UIEventStream* eventStream) { QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, this); layout->setContentsMargins(0,0,0,0); layout->setSpacing(0); diff --git a/Swift/QtUI/EventViewer/QtEventWindow.h b/Swift/QtUI/EventViewer/QtEventWindow.h index b49660a..03f009b 100644 --- a/Swift/QtUI/EventViewer/QtEventWindow.h +++ b/Swift/QtUI/EventViewer/QtEventWindow.h @@ -22,7 +22,7 @@ namespace Swift { class QtEventWindow : public QWidget, public EventWindow { Q_OBJECT public: - QtEventWindow(UIEventStream* eventStream, QWidget* parent = 0); + QtEventWindow(UIEventStream* eventStream); ~QtEventWindow(); void addEvent(boost::shared_ptr<StanzaEvent> event, bool active); void removeEvent(boost::shared_ptr<StanzaEvent> event); |