Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Automatically open the log file when opsu! crashes.

Browse Source 
- Sends a JOptionPane message dialogue if java.awt.Desktop is supported.

Other changes:
- Updated natives directory, and set the LWJGL library path if it exists.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-01-15 02:47:48 -05:00
parent 97f3aad772
commit 09d96f3f08
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/itdelatrisu/opsu/Opsu.java
View File

@ -28,6 +28,7 @@ import itdelatrisu.opsu.states.Options;
import itdelatrisu.opsu.states.SongMenu; import itdelatrisu.opsu.states.SongMenu;
import itdelatrisu.opsu.states.Splash; import itdelatrisu.opsu.states.Splash;
import java.awt.Desktop;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@ -35,6 +36,9 @@ import java.io.IOException;
import java.io.PrintStream; import java.io.PrintStream;
import java.net.ServerSocket; import java.net.ServerSocket;
import javax.swing.JOptionPane;
import javax.swing.UIManager;
import org.newdawn.slick.AppGameContainer; import org.newdawn.slick.AppGameContainer;
import org.newdawn.slick.Color; import org.newdawn.slick.Color;
import org.newdawn.slick.GameContainer; import org.newdawn.slick.GameContainer;
@ -102,8 +106,23 @@ public class Opsu extends StateBasedGame {
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override @Override
public void uncaughtException(Thread t, Throwable e) { public void uncaughtException(Thread t, Throwable e) {
if (!(e instanceof ThreadDeath)) // TODO: see MusicController if (!(e instanceof ThreadDeath)) { // TODO: see MusicController
Log.error("** Uncaught Exception! **", e); Log.error("** Uncaught Exception! **", e);
// try to open the log file
if (Desktop.isDesktopSupported()) {
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
JOptionPane.showMessageDialog(null,
"opsu! has crashed. Please report this!",
"Error", JOptionPane.ERROR_MESSAGE
);
Desktop.getDesktop().open(Options.LOG_FILE);
} catch (Exception e1) {
Log.error("Failed to open log file.", e1);
}
}
}
} }
}); });
@ -119,7 +138,9 @@ public class Opsu extends StateBasedGame {
} }
// set path for lwjgl natives - NOT NEEDED if using JarSplice // set path for lwjgl natives - NOT NEEDED if using JarSplice
// System.setProperty("org.lwjgl.librarypath", new File("native").getAbsolutePath()); File nativeDir = new File("./target/natives/");
if (nativeDir.isDirectory())
System.setProperty("org.lwjgl.librarypath", nativeDir.getAbsolutePath());
// set the resource paths // set the resource paths
ResourceLoader.removeAllResourceLocations(); ResourceLoader.removeAllResourceLocations();