ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-23 17:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'opentk/develop' into develop

Browse source
This commit is contained in:
Tzach Shabtay 2017-01-28 21:17:32 -05:00
parent 1581ac7b8a 12b0603dea
commit f310f4a119
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/OpenTK/Platform/Android/AndroidGameView.cs
View file

@ -457,7 +457,7 @@ namespace OpenTK.Platform.Android
// if the render thread is paused, let it run so it exits // if the render thread is paused, let it run so it exits
pauseSignal.Set (); pauseSignal.Set ();
stopWatch.Stop (); if (stopWatch != null) stopWatch.Stop ();
} }
void PauseThread () void PauseThread ()

2
src/OpenTK/Platform/Android/AndroidGraphicsContext.cs
View file

@ -57,7 +57,7 @@ namespace OpenTK.Platform.Android {
public bool HasSurface public bool HasSurface
{ {
get { return eglWindowInfo.Surface != IntPtr.Zero; } get { return eglWindowInfo != null && eglWindowInfo.Surface != IntPtr.Zero; }
} }
public ISurfaceHolder Holder { public ISurfaceHolder Holder {

1
src/OpenTK/Platform/NativeWindowBase.cs
View file

@ -269,7 +269,6 @@ namespace OpenTK.Platform
if (e.XDelta == 0 && e.YDelta == 0) if (e.XDelta == 0 && e.YDelta == 0)
{ {
Debug.WriteLine("OnMouseMove called without moving the mouse");
return; return;
} }