From: Carsten W. <ca...@us...> - 2006-12-11 22:51:12
|
Update of /cvsroot/jake2/jake2/src/jake2/render/opengl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18481/src/jake2/render/opengl Modified Files: Jsr231Driver.java Log Message: exit thread removed because of linux Index: Jsr231Driver.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Jsr231Driver.java 11 Dec 2006 22:44:38 -0000 1.21 --- Jsr231Driver.java 11 Dec 2006 22:51:09 -0000 1.22 *************** *** 239,285 **** public void shutdown() { ! Thread exit = new Thread(new Runnable() { ! public void run() { - try { - EventQueue.invokeAndWait(new Runnable() { - public void run() { - if (oldDisplayMode != null - && device.getFullScreenWindow() != null) { - try { - if (device.isFullScreenSupported()) { - if (!device.getDisplayMode().equals(oldDisplayMode)) - device.setDisplayMode(oldDisplayMode); - - } - device.setFullScreenWindow(null); - } catch (Exception e) { - e.printStackTrace(); - } } } - }); - } catch (Exception e) { - e.printStackTrace(); - } - if (window != null) { - display.destroy(); - window.dispose(); - while (window.isDisplayable() || display.isDisplayable()) { - try { - Thread.sleep(50); - } catch (InterruptedException e) {} - } } } - }); - exit.start(); - try { - exit.join(); - } catch (InterruptedException e) { } display = null; - } --- 239,276 ---- public void shutdown() { ! try { ! EventQueue.invokeAndWait(new Runnable() { ! public void run() { ! if (oldDisplayMode != null ! && device.getFullScreenWindow() != null) { ! try { ! if (device.isFullScreenSupported()) { ! if (!device.getDisplayMode().equals( ! oldDisplayMode)) ! device.setDisplayMode(oldDisplayMode); } + device.setFullScreenWindow(null); + } catch (Exception e) { + e.printStackTrace(); } } } + }); + } catch (Exception e) { + e.printStackTrace(); + } + if (window != null) { + display.destroy(); + window.dispose(); + while (window.isDisplayable() || display.isDisplayable()) { + try { + Thread.sleep(50); + } catch (InterruptedException e) { + } + } } display = null; } |