norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix some crashers

Browse Source
This commit is contained in:
Christopher Eby 2010-07-24 22:56:20 -05:00
parent 4495daf234
commit 5f72dba0e4
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/kreed/vanilla/SongTimeline.java
View File

@ -20,6 +20,7 @@ package org.kreed.vanilla;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -121,6 +122,8 @@ public final class SongTimeline {
} }
in.close(); in.close();
} catch (EOFException e) {
Log.w("VanillaMusic", "Failed to load state", e);
} catch (IOException e) { } catch (IOException e) {
Log.w("VanillaMusic", "Failed to load state", e); Log.w("VanillaMusic", "Failed to load state", e);
} }
@ -150,8 +153,13 @@ public final class SongTimeline {
for (int i = 0; i != size; ++i) { for (int i = 0; i != size; ++i) {
Song song = songs.get(i); Song song = songs.get(i);
out.writeLong(song.id); if (song == null) {
out.writeInt(song.flags); out.writeLong(-1);
out.writeInt(-1);
} else {
out.writeLong(song.id);
out.writeInt(song.flags);
}
} }
out.writeInt(mCurrentPos); out.writeInt(mCurrentPos);