1 files changed, 4 insertions, 2 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index 72c2964..ed0fae2 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -2,110 +2,112 @@
  * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include "Swift/QtUI/UserSearch/QtUserSearchWindow.h"
 
 #include <QItemDelegate>
 #include <QModelIndex>
 #include <QWizardPage>
 #include <QMovie>
 #include <boost/bind.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/Base/foreach.h>
 #include <Swift/Controllers/UIEvents/UIEventStream.h>
 #include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
 #include <Swift/Controllers/UIEvents/AddContactUIEvent.h>
 #include <Swift/Controllers/UIEvents/CreateImpromptuMUCUIEvent.h>
 #include <Swift/Controllers/UIEvents/InviteToMUCUIEvent.h>
 #include <Swift/QtUI/UserSearch/UserSearchModel.h>
 #include <Swift/QtUI/UserSearch/UserSearchDelegate.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtFormResultItemModel.h>
 #include <Swift/QtUI/UserSearch/QtUserSearchFirstPage.h>
 #include <Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h>
 #include <Swift/QtUI/UserSearch/QtUserSearchFieldsPage.h>
 #include <Swift/QtUI/UserSearch/QtUserSearchResultsPage.h>
 #include <Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h>
 #include <Swift/QtUI/UserSearch/QtContactListWidget.h>
 
 #include <Swiften/Base/Log.h>
 
 namespace Swift {
 
-QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups, SettingsProvider* settingsProvider) : eventStream_(eventStream), type_(type), model_(NULL), settings_(settingsProvider), searchNext_(false), supportsImpromptu_(false) {
+QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups, SettingsProvider* settingsProvider) : eventStream_(eventStream), type_(type), model_(NULL), firstMultiJIDPage_(NULL), settings_(settingsProvider), searchNext_(false), supportsImpromptu_(false) {
 	setupUi(this);
 #ifndef Q_OS_MAC
 	setWindowIcon(QIcon(":/logo-icon-16.png"));
 #endif
 	QString title;
 	switch(type) {
 		case AddContact:
 			title = tr("Add Contact");
 			break;
 		case ChatToContact:
 			title = tr("Chat to Users");
 			break;
 		case InviteToChat:
 			title = tr("Add Users to Chat");
 			break;
 	}
 	setWindowTitle(title);
 
 	delegate_ = new UserSearchDelegate();
 
 	setFirstPage(title);
 	setSecondPage();
 	setThirdPage();
 
 	detailsPage_ = new QtUserSearchDetailsPage(groups);
 	setPage(4, detailsPage_);
 
 	connect(this, SIGNAL(currentIdChanged(int)), this, SLOT(handleCurrentChanged(int)));
 	connect(this, SIGNAL(accepted()), this, SLOT(handleAccepted()));
 	clear();
 }
 
 QtUserSearchWindow::~QtUserSearchWindow() {
 	delete model_;
 }
 
 void QtUserSearchWindow::handleCurrentChanged(int page) {
 	searchNext_ = false;
-	firstMultiJIDPage_->reset();
+	if (firstMultiJIDPage_) {
+		firstMultiJIDPage_->reset();
+	}
 	resultsPage_->emitCompletenessCheck();
 	if (page == 1 && lastPage_ == 3) {
 		addSearchedJIDToList(getContactJID());
 		setSecondPage();
 	}
 	else if (page == 2 && lastPage_ == 1) {
 		setError("");
 		/* next won't be called if JID is selected */
 		JID server = getServerToSearch();
 		clearForm();
 		onFormRequested(server);
 		setThirdPage();
 	}
 	else if (page == 3 && lastPage_ == 2) {
 		JID server = getServerToSearch();
 		handleSearch();
 
 		if (type_ == AddContact) {
 			bool remote = firstPage_->byRemoteSearch_->isChecked();
 			firstPage_->byRemoteSearch_->setChecked(remote);
 			firstPage_->service_->setEditText(P2QSTRING(server.toString()));
 		} else {
 			bool remote = firstMultiJIDPage_->byRemoteSearch_->isChecked();
 			setFirstPage();
 			firstMultiJIDPage_->byRemoteSearch_->setChecked(remote);
 			firstMultiJIDPage_->service_->setEditText(P2QSTRING(server.toString()));
 		}
 	}
 	else if (page == 4) {
 		detailsPage_->clear();
 		detailsPage_->setJID(getContactJID());
 		onNameSuggestionRequested(getContactJID());
 	}
 	lastPage_ = page;
 }