X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fapp.cpp;h=3961d31aaef3c92b7aba18b2790623fa79e7c11f;hb=5c28b6dbf7aa20441c8a51f484f4f64b1966f7e3;hp=220275a2cee506c98e0b1ac45afe309f901f0a0e;hpb=ab4f660439ff855171f801e3fdfa3e9de69d991b;p=virtualjaguar

diff --git a/src/gui/app.cpp b/src/gui/app.cpp
index 220275a..3961d31 100644
--- a/src/gui/app.cpp
+++ b/src/gui/app.cpp
@@ -18,6 +18,7 @@
 
 #include <SDL.h>
 #include <QApplication>
+#include "gamepad.h"
 #include "log.h"
 #include "mainwin.h"
 #include "settings.h"
@@ -97,7 +98,9 @@ int main(int argc, char * argv[])
 	{
 		WriteLog("VJ: SDL (joystick, audio) successfully initialized.\n");
 		App app(argc, argv);					// Declare an instance of the application
+		Gamepad::AllocateJoysticks();
 		retVal = app.exec();					// And run it!
+		Gamepad::DeallocateJoysticks();
 
 		// Free SDL components last...!
 		SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_AUDIO);
@@ -116,7 +119,7 @@ int main(int argc, char * argv[])
 //
 // Main app constructor--we stick globally accessible stuff here... (?)
 //
-App::App(int argc, char * argv[]): QApplication(argc, argv)
+App::App(int & argc, char * argv[]): QApplication(argc, argv)
 {
 	bool loadAndGo = !filename.isEmpty();