Adjusted the popup issue fix to ensure nothing breaks in either regular or oculus mode.

This commit is contained in:
Areloch 2015-06-01 22:34:55 -05:00
parent f5d8de8c4d
commit 9368b7b915
4 changed files with 4 additions and 4 deletions

View file

@ -20,7 +20,8 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
$GameCanvas = 0;
if($GameCanvas == OculusCanvas)
$GameCanvas = 0;
// Cleanup Dialog created by 'core'
if( isObject( MessagePopupDlg ) )

View file

@ -55,7 +55,6 @@ function GameConnection::initialControlSet(%this)
{
if (Canvas.getContent() != PlayGui.getId())
Canvas.setContent(PlayGui);
$GameCanvas = Canvas;
}
}

View file

@ -20,7 +20,8 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
$GameCanvas = 0;
if($GameCanvas == OculusCanvas)
$GameCanvas = 0;
// Cleanup Dialog created by 'core'
if( isObject( MessagePopupDlg ) )

View file

@ -56,7 +56,6 @@ function GameConnection::initialControlSet(%this)
if (Canvas.getContent() != PlayGui.getId())
{
Canvas.setContent(PlayGui);
$GameCanvas = Canvas;
}
}
}