aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorMax Lingua2014-01-23 16:32:33 -0500
committerMax Lingua2014-01-23 18:34:51 -0500
commit6487c362a1909b10886ee95f4f91109a7808fd33 (patch)
treea6f0e86e4e68067e88e627a8056b6b3bbe6a0903 /backends
parentc16c6653a112307d4f5ded3c3533f9621a945cb3 (diff)
downloadscummvm-rg350-6487c362a1909b10886ee95f4f91109a7808fd33.tar.gz
scummvm-rg350-6487c362a1909b10886ee95f4f91109a7808fd33.tar.bz2
scummvm-rg350-6487c362a1909b10886ee95f4f91109a7808fd33.zip
PS2: Init Ps2Input after USB drivers are loaded
Diffstat (limited to 'backends')
-rw-r--r--backends/platform/ps2/systemps2.cpp7
1 files changed, 4 insertions, 3 deletions
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);
}
}