From 6487c362a1909b10886ee95f4f91109a7808fd33 Mon Sep 17 00:00:00 2001
From: Max Lingua
Date: Thu, 23 Jan 2014 16:32:33 -0500
Subject: PS2: Init Ps2Input after USB drivers are loaded

---
 backends/platform/ps2/systemps2.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'backends/platform/ps2')

diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp
index f3807ea91f..5f3edd345a 100644
--- a/backends/platform/ps2/systemps2.cpp
+++ b/backends/platform/ps2/systemps2.cpp
@@ -384,9 +384,6 @@ void OSystem_PS2::init(void) {
 	sioprintf("Starting SavefileManager\n");
 	_savefileManager = new Ps2SaveFileManager(this, _screen);
 
-	sioprintf("Initializing ps2Input\n");
-	_input = new Ps2Input(this, _useMouse, _useKbd);
-
 	prepMC();
 	makeConfigPath();
 
@@ -438,11 +435,15 @@ void OSystem_PS2::config(void) {
 		else {
 			loadDrivers(IRX_USB);
 			loadDrivers(IRX_INPUT);
+			sioprintf("Initializing ps2Input\n");
+			_input = new Ps2Input(this, _useMouse, _useKbd);
 		}
 	}
 	else { // load USB drivers (mass & input(
 		loadDrivers(IRX_USB);
 		loadDrivers(IRX_INPUT);
+		sioprintf("Initializing ps2Input\n");
+		_input = new Ps2Input(this, _useMouse, _useKbd);
 	}
 }
 
-- 
cgit v1.2.3