OSDN Git Service
(root)
/
mikumikustudio
/
libgdx-mikumikustudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
de2b88c
)
[fixed] issue 54 (sort off). Checking for null pointers in XXXAudio.dispose() now...
author
badlogicgames
<badlogicgames@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Tue, 9 Nov 2010 20:36:15 +0000
(20:36 +0000)
committer
badlogicgames
<badlogicgames@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Tue, 9 Nov 2010 20:36:15 +0000
(20:36 +0000)
backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglAudio.java
patch
|
blob
|
history
backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglAudio.java
patch
|
blob
|
history
diff --git
a/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglAudio.java
b/backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglAudio.java
index
16219b3
..
83241ad
100644
(file)
--- a/
backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglAudio.java
+++ b/
backends/gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglAudio.java
@@
-211,8
+211,12
@@
final class JoglAudio implements Audio, Runnable {
void dispose() {
\r
run = false;
\r
try {
\r
- thread.join();
\r
- } catch (InterruptedException e) {
\r
+ if(thread != null)
\r
+ thread.join();
\r
+ if(line != null)
\r
+ line.close();
\r
+ }
\r
+ catch (InterruptedException e) {
\r
}
\r
}
\r
}
\r
diff --git
a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglAudio.java
b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglAudio.java
index
a6e7cf0
..
3105e66
100644
(file)
--- a/
backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglAudio.java
+++ b/
backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglAudio.java
@@
-198,7
+198,10
@@
final class LwjglAudio implements Audio, Runnable {
void dispose ( ) {
\r
run = false;
\r
try {
\r
- thread.join();
\r
+ if(thread != null)
\r
+ thread.join();
\r
+ if(line != null)
\r
+ line.close();
\r
} catch (InterruptedException e) {
\r
}
\r
}
\r