From 2e71a635749350960c2c5d8b171b18a2391b77c0 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@brown.edu>
Date: Tue, 7 Jun 2016 13:28:10 -0700
Subject: [PATCH] cr fixes

---
 plugins/hifiSdl2/src/Joystick.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/hifiSdl2/src/Joystick.cpp b/plugins/hifiSdl2/src/Joystick.cpp
index aa6b358d38..e88fe8b958 100644
--- a/plugins/hifiSdl2/src/Joystick.cpp
+++ b/plugins/hifiSdl2/src/Joystick.cpp
@@ -25,9 +25,12 @@ Joystick::Joystick(SDL_JoystickID instanceId, SDL_GameController* sdlGameControl
     _instanceId(instanceId)
 {
     if (!_sdlHaptic) {
-        qDebug() << QString(SDL_GetError());
+        qDebug() << "SDL Haptic Open Failure: " << QString(SDL_GetError());
+    } else {
+        if (SDL_HapticRumbleInit(_sdlHaptic) != 0) {
+            qDebug() << "SDL Haptic Rumble Init Failure: " << QString(SDL_GetError());
+        }
     }
-    SDL_HapticRumbleInit(_sdlHaptic);
 }
 
 Joystick::~Joystick() {
@@ -35,7 +38,9 @@ Joystick::~Joystick() {
 }
 
 void Joystick::closeJoystick() {
-    SDL_HapticClose(_sdlHaptic);
+    if (_sdlHaptic) {
+        SDL_HapticClose(_sdlHaptic);
+    }
     SDL_GameControllerClose(_sdlGameController);
 }