Bug 146025. Prevent CASAManager from launch if MasterPassword login dialog is closed.
This commit is contained in:
		| @@ -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 | Sat Jan 28 11:46:59 MST 2006 - jnorman@novell.com | ||||||
|  |  | ||||||
|   | |||||||
| @@ -446,6 +446,13 @@ namespace Novell.CASA.GUI | |||||||
| 		public void closebuttonLogin_clicked(object abj, EventArgs args) | 		public void closebuttonLogin_clicked(object abj, EventArgs args) | ||||||
| 		{ | 		{ | ||||||
| 			dialogLogin.Destroy();  | 			dialogLogin.Destroy();  | ||||||
|  | 			// close tray too | ||||||
|  | 			if (mCasaTray != null) | ||||||
|  | 			{	 | ||||||
|  | 				mCasaTray.Destroy(); | ||||||
|  | 				mCasaTray = null; | ||||||
|  | 			} | ||||||
|  |  | ||||||
| 			HandleQuit();    	 | 			HandleQuit();    	 | ||||||
| 		} | 		} | ||||||
|      |      | ||||||
| @@ -454,6 +461,12 @@ namespace Novell.CASA.GUI | |||||||
| 		{ | 		{ | ||||||
| 			Logger.DbgLog("GUI:CasaMain.OnDialogLoginDeleted() - BEGIN"); | 			Logger.DbgLog("GUI:CasaMain.OnDialogLoginDeleted() - BEGIN"); | ||||||
|     	 |     	 | ||||||
|  | 			// close tray too | ||||||
|  | 			if (mCasaTray != null) | ||||||
|  | 			{	 | ||||||
|  | 				mCasaTray.Destroy(); | ||||||
|  | 				mCasaTray = null; | ||||||
|  | 			} | ||||||
| 			HandleQuit();    	 | 			HandleQuit();    	 | ||||||
| 			args.RetVal = true; | 			args.RetVal = true; | ||||||
|          |          | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user