summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti <silenio_quarti@ca.ibm.com>2012-05-10 09:34:59 -0400
committerSilenio Quarti <silenio_quarti@ca.ibm.com>2012-05-10 09:35:27 -0400
commit2c17c2eb0fd706a78278bd4e42a02b892eef6dde (patch)
tree6eecdd061b60c548b0067faba177c240fd868787
parent9edcb6fbe23b14c84de5454c12e380279081437b (diff)
downloadeclipse.platform.swt-2c17c2eb0fd706a78278bd4e42a02b892eef6dde.tar.gz
eclipse.platform.swt-2c17c2eb0fd706a78278bd4e42a02b892eef6dde.tar.xz
eclipse.platform.swt-2c17c2eb0fd706a78278bd4e42a02b892eef6dde.zip
fix leak
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java6
1 files changed, 4 insertions, 2 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 818f311835..a5dc6842e5 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
@@ -2397,12 +2397,14 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
buffer = Converter.wcsToMbcs (null, chars, true);
}
int /*long*/ oldTooltip = OS.gtk_widget_get_tooltip_text (rootWidget);
+ boolean same = false;
if (buffer == null && oldTooltip == 0) {
- return;
+ same = true;
} else if (buffer != null && oldTooltip != 0) {
- if (OS.strcmp (oldTooltip, buffer) == 0) return;
+ same = OS.strcmp (oldTooltip, buffer) == 0;
}
if (oldTooltip != 0) OS.g_free(oldTooltip);
+ if (same) return;
OS.gtk_widget_set_tooltip_text (rootWidget, null);
/*
* Bug in GTK. In GTK 2.12, due to a miscalculation of window