Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client

Former-commit-id: 957d232286 [formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]
Former-commit-id: a82f2c5750
This commit is contained in:
Steve Harris 2012-02-23 10:18:56 -06:00
commit e6c3afa7a2

View file

@ -559,17 +559,20 @@ public class GLTarget implements IGLTarget {
*/
@Override
public void dispose() {
theContext.makeContextCurrent();
if (defaultFont != null) {
defaultFont.disposeInternal();
defaultFont = null;
}
if (colorbarFont != null) {
colorbarFont.disposeInternal();
colorbarFont = null;
}
theContext.releaseContext();
theContext.destroyContext();
if (theCanvas != null && theCanvas.isDisposed() == false) {
theCanvas.removeListener(SWT.Resize, this.canvasResizeListener);
}
lastColormapUsed = null;