aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Barkovic2014-07-22 21:23:46 (EDT)
committerJoshua Barkovic2014-07-22 21:23:46 (EDT)
commita6bf16beb2915bb7b4a73e940a69efc5b6d489f9 (patch)
tree9edeb6453e835b5ec1b3ecf560224690b275295f
parentc02fab6ccbca448ca5a30ce60652073b28a5f5f1 (diff)
downloadeclipse.platform.swt-a6bf16beb2915bb7b4a73e940a69efc5b6d489f9.zip
eclipse.platform.swt-a6bf16beb2915bb7b4a73e940a69efc5b6d489f9.tar.gz
eclipse.platform.swt-a6bf16beb2915bb7b4a73e940a69efc5b6d489f9.tar.bz2
Bug 439301 - [Wayland] Setting Cursor can cause crash on Wayland systemrefs/changes/99/30299/1
Bug was reopened, guarded more X11 code Identical set of methods, called in reversed order also causes a crash. Change-Id: Iecbf77f81f0ff549fcd7d5a020e943721181ed02 Signed-off-by: Joshua Barkovic <joshbarkovic@gmail.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
index 3124ca6..b5f235d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
@@ -1874,7 +1874,7 @@ public void setEnabled (boolean enabled) {
if (enableWindow != 0) {
if (cursor != null) {
OS.gdk_window_set_cursor (enableWindow, cursor.handle);
- if (!OS.GDK_WINDOWING_X11 ()) {
+ if (!OS.GDK_WINDOWING_X11 () || OS.GDK_WINDOWING_WAYLAND ()) {
OS.gdk_flush ();
} else {
long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());