Bug 146025. Prevent CASAManager from launch if MasterPassword login dialog is closed.

This commit is contained in:
Jim Norman 2006-01-29 03:16:33 +00:00
parent dd3a9bed33
commit 6055982262
2 changed files with 20 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Jan 28 20:12:59 MST 2006 - jnorman@novell.com
- Bug 146025. Prevent CASA manager from launch if
MasterPassword login dialog is closed.
-------------------------------------------------------------------
Sat Jan 28 11:46:59 MST 2006 - jnorman@novell.com

View File

@ -445,7 +445,14 @@ namespace Novell.CASA.GUI
public void closebuttonLogin_clicked(object abj, EventArgs args)
{
dialogLogin.Destroy();
dialogLogin.Destroy();
// close tray too
if (mCasaTray != null)
{
mCasaTray.Destroy();
mCasaTray = null;
}
HandleQuit();
}
@ -454,6 +461,12 @@ namespace Novell.CASA.GUI
{
Logger.DbgLog("GUI:CasaMain.OnDialogLoginDeleted() - BEGIN");
// close tray too
if (mCasaTray != null)
{
mCasaTray.Destroy();
mCasaTray = null;
}
HandleQuit();
args.RetVal = true;