From 605598226289ba1df275edee4328fb1030e49174 Mon Sep 17 00:00:00 2001 From: Jim Norman Date: Sun, 29 Jan 2006 03:16:33 +0000 Subject: [PATCH] Bug 146025. Prevent CASAManager from launch if MasterPassword login dialog is closed. --- CASA.changes | 6 ++++++ c_gui/CasaMain.cs | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CASA.changes b/CASA.changes index 41aa1190..ff2eb39e 100644 --- a/CASA.changes +++ b/CASA.changes @@ -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 diff --git a/c_gui/CasaMain.cs b/c_gui/CasaMain.cs index 7b15d621..eeef0195 100644 --- a/c_gui/CasaMain.cs +++ b/c_gui/CasaMain.cs @@ -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;