mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-941 - Pressing Cancel in "Log out with reason" window shouldnt log out

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@11461 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Michael Will
2009-12-16 12:58:10 +00:00
committed by michael.will
parent 1166ffd65a
commit b3377dadf9
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/java/org/jivesoftware/MainWindow.java
View File

@ -287,18 +287,21 @@ public final class MainWindow extends ChatFrame implements ActionListener {
status = inputTextDialog.getInput(Res.getString("title.status.message"), Res.getString("message.current.status"),
SparkRes.getImageIcon(SparkRes.USER1_MESSAGE_24x24), this);
}
// Notify all MainWindowListeners
try {
// Set auto-login to false;
SettingsManager.getLocalPreferences().setAutoLogin(false);
SettingsManager.saveSettings();
fireWindowShutdown();
setVisible(false);
}
finally {
closeConnectionAndInvoke(status);
if (status != null)
{
// Notify all MainWindowListeners
try {
// Set auto-login to false;
SettingsManager.getLocalPreferences().setAutoLogin(false);
SettingsManager.saveSettings();
fireWindowShutdown();
setVisible(false);
}
finally {
closeConnectionAndInvoke(status);
}
}
}