=== modified file 'win32/HubFrame.cpp'
--- win32/HubFrame.cpp	2011-02-02 17:45:47 +0000
+++ win32/HubFrame.cpp	2011-02-14 23:03:37 +0000
@@ -129,6 +129,7 @@
 resort(false),
 showJoins(BOOLSETTING(SHOW_JOINS)),
 favShowJoins(BOOLSETTING(FAV_SHOW_JOINS)),
+closing(false),
 currentUser(0),
 hubMenu(false),
 inTabComplete(false)
@@ -241,6 +242,7 @@
 		dwt::MessageBox(this).show(getText() + _T("\n\n") + T_("Really close?"), _T(APPNAME) _T(" ") _T(VERSIONSTRING), dwt::MessageBox::BOX_YESNO, dwt::MessageBox::BOX_ICONQUESTION) == IDNO)
 		return false;
 
+	closing = true;
 	FavoriteManager::getInstance()->removeListener(this);
 	client->removeListener(this);
 	client->disconnect(true);
@@ -548,6 +550,7 @@
 		if(BOOLSETTING(PROMPT_PASSWORD)) {
 			ParamDlg linePwd(this, getText(), T_("Please enter a password"), Util::emptyStringT, true);
 			auto res = linePwd.run();
+			if (closing) return;
 			waitingForPW = false;
 			if(res == IDOK) {
 				client->setPassword(Text::fromT(linePwd.getValue()));

=== modified file 'win32/HubFrame.h'
--- win32/HubFrame.h	2011-02-02 17:45:47 +0000
+++ win32/HubFrame.h	2011-02-14 22:48:37 +0000
@@ -171,6 +171,7 @@
 	bool resort;
 	bool showJoins;
 	bool favShowJoins;
+	bool closing;
 
 	TaskQueue tasks; // todo get rid of TaskQueue