src/haptic/win32/SDL_syshaptic.c
branchgsoc2008_force_feedback
changeset 2561 3696b9ce8a37
parent 2551 f010e1d4e431
child 2566 94ff09afa478
--- a/src/haptic/win32/SDL_syshaptic.c	Thu Jul 31 09:02:43 2008 +0000
+++ b/src/haptic/win32/SDL_syshaptic.c	Thu Jul 31 09:45:27 2008 +0000
@@ -361,9 +361,6 @@
    return 0;
    
    /* Error handling */
-open_err:
-   IDirectInputDevice_Release(device);
-   goto creat_err;
 acquire_err:
    IDirectInputDevice2_Unacquire(haptic->hwdata->device);
 query_err:
@@ -435,19 +432,11 @@
 void
 SDL_SYS_HapticClose(SDL_Haptic * haptic)
 {
-   int i;
-
    if (haptic->hwdata) {
 
-      /* Free the effects. */
-      for (i=0; i<haptic->neffects; i++) {        
-         if (haptic->effects[i].hweffect != NULL) {
-            SDL_SYS_HapticFreeFFEFFECT( &haptic->effects[i].hweffect->effect,
-                                        haptic->effects[i].effect.type );
-            SDL_free(haptic->effects[i].hweffect);
-         } 
-      }    
+      /* Free effects. */
       SDL_free(haptic->effects);
+      haptic->effects = NULL;
       haptic->neffects = 0;
 
       /* Clean up */