diff --git a/lib/MSWindows/win32.c b/lib/MSWindows/win32.c
index 1065b904..5a23e51d 100644
--- a/lib/MSWindows/win32.c
+++ b/lib/MSWindows/win32.c
@@ -1,5 +1,5 @@
 /*
-    $Id: win32.c,v 1.39 2004/08/07 22:58:51 rocky Exp $
+    $Id: win32.c,v 1.40 2004/08/08 00:20:21 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: win32.c,v 1.39 2004/08/07 22:58:51 rocky Exp $";
+static const char _rcsid[] = "$Id: win32.c,v 1.40 2004/08/08 00:20:21 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -516,9 +516,9 @@ _get_cdtext_win32 (void *user_data, track_t i_track)
 
   if (!p_env->gen.b_cdtext_init) {
     if (p_env->hASPI) {
-      p_env->b_cdtext_init = init_cdtext_aspi(p_env);
+      p_env->gen.b_cdtext_init = init_cdtext_aspi(p_env);
     }  else 
-      p_env->b_cdtext_init = init_cdtext_win32ioctl(p_env);
+      p_env->gen.b_cdtext_init = init_cdtext_win32ioctl(p_env);
   }
     
   if (!p_env->gen.b_cdtext_init) return NULL;
@@ -526,7 +526,7 @@ _get_cdtext_win32 (void *user_data, track_t i_track)
   if (0 == i_track) 
     return &(p_env->cdtext);
   else 
-    return &(p_env->tocent[i_track-env->gen.i_first_track].cdtext);
+    return &(p_env->tocent[i_track-p_env->gen.i_first_track].cdtext);
 
   return NULL;
 }