Merge pull request #6580 from deathbeam/lock-only-on-linux

Unlock surface only with X11JAWTWindow
This commit is contained in:
Adam
2018-11-19 20:35:03 -05:00
committed by GitHub

View File

@@ -49,6 +49,7 @@ import java.nio.FloatBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.util.function.Function; import java.util.function.Function;
import javax.inject.Inject; import javax.inject.Inject;
import jogamp.nativewindow.jawt.x11.X11JAWTWindow;
import jogamp.newt.awt.NewtFactoryAWT; import jogamp.newt.awt.NewtFactoryAWT;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.BufferProvider; import net.runelite.api.BufferProvider;
@@ -255,7 +256,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
throw new GLException("Unable to make context current"); throw new GLException("Unable to make context current");
} }
if (jawtWindow.getLock().isLocked()) // Surface needs to be unlocked on X11 window otherwise input is blocked
if (jawtWindow instanceof X11JAWTWindow && jawtWindow.getLock().isLocked())
{ {
jawtWindow.unlockSurface(); jawtWindow.unlockSurface();
} }