1 files changed, 2 insertions, 2 deletions

diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index f2a2727..af96a80 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -607,8 +607,6 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
         // Initialize (boot strap) the Language text input management,
         // based on the system's (or user's) default settings.
         allowLanguageTextInput(NULL, FALSE);
-
-        SetTimer( mWindowHandle, 0, 1000 / 30, NULL ); // 30 fps timer
 }
 
 
@@ -1351,6 +1349,8 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
         //make sure multi sampling is disabled by default
         glDisable(GL_MULTISAMPLE_ARB);
 
+        //register joystick timer callback
+        SetTimer( mWindowHandle, 0, 1000 / 30, NULL ); // 30 fps timer
 
         // ok to post quit messages now
         mPostQuit = TRUE;