From f9aed393528f19b1a9bd6bbe564cba2c09fc334a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 11 Nov 2014 18:17:24 -0800
Subject: [PATCH 1/2] don't try to open a joystick if controller is NULL

---
 interface/src/scripting/JoystickScriptingInterface.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/interface/src/scripting/JoystickScriptingInterface.cpp b/interface/src/scripting/JoystickScriptingInterface.cpp
index 68affeda5b..40109703d6 100644
--- a/interface/src/scripting/JoystickScriptingInterface.cpp
+++ b/interface/src/scripting/JoystickScriptingInterface.cpp
@@ -52,9 +52,12 @@ JoystickScriptingInterface::JoystickScriptingInterface() :
 
         for (int i = 0; i < joystickCount; i++) {
             SDL_GameController* controller = SDL_GameControllerOpen(i);
-            SDL_JoystickID id = getInstanceId(controller);
-            Joystick* joystick = new Joystick(id, SDL_GameControllerName(controller), controller);
-            _openJoysticks[id] = joystick;
+            
+            if (controller) {
+                SDL_JoystickID id = getInstanceId(controller);
+                Joystick* joystick = new Joystick(id, SDL_GameControllerName(controller), controller);
+                _openJoysticks[id] = joystick;
+            }
         }
 
         _isInitialized = true;

From 9bd870f4b09da301a5ab1597ca0c8c503ebf35b6 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 11 Nov 2014 20:45:04 -0800
Subject: [PATCH 2/2] fix hifi url handling after update to 5.3.2

---
 interface/src/Application.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b1c969b66f..bb19ce3ca5 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -837,14 +837,12 @@ void Application::controlledBroadcastToNodes(const QByteArray& packet, const Nod
 }
 
 bool Application::event(QEvent* event) {
-
     // handle custom URL
     if (event->type() == QEvent::FileOpen) {
         
         QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event);
-        
-        if (!fileEvent->url().isEmpty()) {
-            AddressManager::getInstance().handleLookupString(fileEvent->url().toLocalFile());
+        if (fileEvent->url().isValid()) {
+            openUrl(fileEvent->url());
         }
         
         return false;