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

Templates/Empty/game/core/scripts/gui/messageBoxes/messageBox.ed.cs

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

Templates/Empty/game/scripts/client/serverConnection.cs

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

Templates/Full/game/core/scripts/gui/messageBoxes/messageBox.ed.cs

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

Templates/Full/game/scripts/client/serverConnection.cs

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