kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/openfl/lime into wiimote

Browse Source
This commit is contained in:
Lars A. Doucet
2015-07-15 12:56:13 -05:00
parent 924f478a81 634c48b10b
commit 9641f153a1
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lime/Assets.hx
View File

@@ -935,6 +935,7 @@ class Assets {
if (library != null) {
cache.clear (name + ":");
library.unload ();
library.eventCallback = null;
}
@@ -1140,6 +1141,13 @@ class AssetLibrary {
}
private function unload ():Void {
}
}

10
lime/_backend/native/NativeApplication.hx
View File

@@ -144,9 +144,11 @@ class NativeApplication {
case CONNECT:
var gamepad = new Gamepad (gamepadEventInfo.id);
Gamepad.devices.set (gamepadEventInfo.id, gamepad);
parent.window.onGamepadConnect.dispatch (gamepad);
if (!Gamepad.devices.exists(gamepadEventInfo.id)) {
var gamepad = new Gamepad (gamepadEventInfo.id);
Gamepad.devices.set (gamepadEventInfo.id, gamepad);
parent.window.onGamepadConnect.dispatch (gamepad);
}
case DISCONNECT:
@@ -753,4 +755,4 @@ private class WindowEventInfo {
var WINDOW_RESIZE = 9;
var WINDOW_RESTORE = 10;
}
}