geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 143901. Prevent null exceptions under certain conditions.

Browse Source
This commit is contained in:
Jim Norman 2006-01-18 23:03:35 +00:00
parent 310dc000db
commit bf2ce71f10
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
c_gui/CasaMain.cs
View File

@ -189,8 +189,15 @@ namespace Novell.CASA.GUI
} }
else else
{ {
Glade.XML gxmlTemp = new Glade.XML(Common.GladeFile, "dialogSingleInstance", null); //if (Common.IS_LINUX)
gxmlTemp.Autoconnect(this); {
Glade.XML gxmlTemp = new Glade.XML(Common.GladeFile, "dialogSingleInstance", null);
gxmlTemp.Autoconnect(this);
}
//else
//{
// Common.FocusExistingApp();
//}
} }
Logger.DbgLog("GUI:CasaMain.CasaMain() - END"); Logger.DbgLog("GUI:CasaMain.CasaMain() - END");
@ -1390,23 +1397,31 @@ namespace Novell.CASA.GUI
/// ///
internal void Focus() internal void Focus()
{ {
windowMain.Present(); if (windowMain != null)
windowMain.Present();
} }
internal void Hide() internal void Hide()
{ {
windowMain.Visible = false; if (windowMain != null)
windowMain.Visible = false;
} }
internal void Show() internal void Show()
{ {
RefreshStores(); if (windowMain == null)
windowMain.Visible = true; MasterPasswordAuthentication();
else
{
RefreshStores();
windowMain.Visible = true;
}
} }
internal void Dispose() internal void Dispose()
{ {
windowMain.Destroy(); if (windowMain != null)
windowMain.Destroy();
} }
internal void RefreshStores() internal void RefreshStores()