From 88b2f1b7149dd2d730aa9cd7daa87950b38fa413 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Thu, 21 Mar 2013 23:13:47 +0000
Subject: [PATCH] [Fix] Potential seg fault.

---
 src/conf.c  | 2 +-
 src/input.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/conf.c b/src/conf.c
index a248590..d6b21ef 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -78,7 +78,7 @@ void conf_setDefaults(void) {
   data = DATA_DEF;
   // GL.
   gl_screen.w = 800;
-  gl_screen.h = 640;
+  gl_screen.h = 600;
   gl_screen.flags = 0;
   // Openal.
   nosound = 1; // TODO: make sound default when it's sane again.
diff --git a/src/input.c b/src/input.c
index edb0d08..62976a3 100644
--- a/src/input.c
+++ b/src/input.c
@@ -122,7 +122,7 @@ void input_setKeybind(char* keybind, KeybindType type, int key, int reverse) {
 #define INGAME() (!toolkit)
 // We won't be having any more funny stuff from VLack..
 #define NOHYP() \
-  (!pilot_isFlag(player, PILOT_HYP_PREP) && \
+  (player && !pilot_isFlag(player, PILOT_HYP_PREP) && \
   !pilot_isFlag(player, PILOT_HYP_BEGIN) && \
   !pilot_isFlag(player, PILOT_HYPERSPACE))
 static void input_key(int keynum, double value, int abs) {