Bug 143901. Prevent null exceptions under certain conditions.
This commit is contained in:
parent
310dc000db
commit
bf2ce71f10
@ -189,8 +189,15 @@ namespace Novell.CASA.GUI
|
||||
}
|
||||
else
|
||||
{
|
||||
Glade.XML gxmlTemp = new Glade.XML(Common.GladeFile, "dialogSingleInstance", null);
|
||||
gxmlTemp.Autoconnect(this);
|
||||
//if (Common.IS_LINUX)
|
||||
{
|
||||
Glade.XML gxmlTemp = new Glade.XML(Common.GladeFile, "dialogSingleInstance", null);
|
||||
gxmlTemp.Autoconnect(this);
|
||||
}
|
||||
//else
|
||||
//{
|
||||
// Common.FocusExistingApp();
|
||||
//}
|
||||
}
|
||||
|
||||
Logger.DbgLog("GUI:CasaMain.CasaMain() - END");
|
||||
@ -1390,23 +1397,31 @@ namespace Novell.CASA.GUI
|
||||
///
|
||||
internal void Focus()
|
||||
{
|
||||
windowMain.Present();
|
||||
if (windowMain != null)
|
||||
windowMain.Present();
|
||||
}
|
||||
|
||||
internal void Hide()
|
||||
{
|
||||
windowMain.Visible = false;
|
||||
if (windowMain != null)
|
||||
windowMain.Visible = false;
|
||||
}
|
||||
|
||||
internal void Show()
|
||||
{
|
||||
RefreshStores();
|
||||
windowMain.Visible = true;
|
||||
if (windowMain == null)
|
||||
MasterPasswordAuthentication();
|
||||
else
|
||||
{
|
||||
RefreshStores();
|
||||
windowMain.Visible = true;
|
||||
}
|
||||
}
|
||||
|
||||
internal void Dispose()
|
||||
{
|
||||
windowMain.Destroy();
|
||||
{
|
||||
if (windowMain != null)
|
||||
windowMain.Destroy();
|
||||
}
|
||||
|
||||
internal void RefreshStores()
|
||||
|
Loading…
Reference in New Issue
Block a user