diff -ur rockbox-19370/apps/cuesheet.c rockbox-19370-notempcue/apps/cuesheet.c
--- rockbox-19370/apps/cuesheet.c	2008-12-09 12:28:35.000000000 -0500
+++ rockbox-19370-notempcue/apps/cuesheet.c	2008-12-13 23:39:39.214600000 -0500
@@ -45,7 +45,6 @@
 #define CUE_DIR ROCKBOX_DIR "/cue"
 
 struct cuesheet *curr_cue;
-struct cuesheet *temp_cue;
 
 #if CONFIG_CODEC != SWCODEC
 /* special trickery because the hwcodec playback engine is in firmware/ */
@@ -59,13 +58,11 @@
 {
     if (global_settings.cuesheet) {
         curr_cue = (struct cuesheet *)buffer_alloc(sizeof(struct cuesheet));
-        temp_cue = (struct cuesheet *)buffer_alloc(sizeof(struct cuesheet));
 #if CONFIG_CODEC != SWCODEC
         audio_set_cuesheet_callback(cuesheet_handler);
 #endif
     } else {
         curr_cue = NULL;
-        temp_cue = NULL;
     }
 }
 
diff -ur rockbox-19370/apps/cuesheet.h rockbox-19370-notempcue/apps/cuesheet.h
--- rockbox-19370/apps/cuesheet.h	2008-12-09 12:28:35.000000000 -0500
+++ rockbox-19370-notempcue/apps/cuesheet.h	2008-12-13 23:41:47.833000000 -0500
@@ -53,7 +53,6 @@
 };
 
 extern struct cuesheet *curr_cue;
-extern struct cuesheet *temp_cue;
 
 /* returns true if cuesheet support is initialised */
 bool cuesheet_is_enabled(void);
diff -ur rockbox-19370/apps/gui/gwps-common.c rockbox-19370-notempcue/apps/gui/gwps-common.c
--- rockbox-19370/apps/gui/gwps-common.c	2008-12-09 12:28:36.000000000 -0500
+++ rockbox-19370-notempcue/apps/gui/gwps-common.c	2008-12-13 23:41:29.924200000 -0500
@@ -427,23 +427,15 @@
             && strcmp(gwps->state->id3->path, curr_cue->audio_filename))
         {
             /* the current cuesheet isn't the right one any more */
+            /* We need to parse the new cuesheet */
 
-            if (!strcmp(gwps->state->id3->path, temp_cue->audio_filename)) {
-                /* We have the new cuesheet in memory (temp_cue),
-                   let's make it the current one ! */
-                memcpy(curr_cue, temp_cue, sizeof(struct cuesheet));
-            }
-            else {
-                /* We need to parse the new cuesheet */
-
-                char cuepath[MAX_PATH];
+            char cuepath[MAX_PATH];
 
-                if (look_for_cuesheet_file(gwps->state->id3->path, cuepath) &&
-                    parse_cuesheet(cuepath, curr_cue))
-                {
-                    gwps->state->id3->cuesheet_type = 1;
-                    strcpy(curr_cue->audio_filename, gwps->state->id3->path);
-                }
+            if (look_for_cuesheet_file(gwps->state->id3->path, cuepath) &&
+                parse_cuesheet(cuepath, curr_cue))
+            {
+                gwps->state->id3->cuesheet_type = 1;
+                strcpy(curr_cue->audio_filename, gwps->state->id3->path);
             }
 
             cue_spoof_id3(curr_cue, gwps->state->id3);
diff -ur rockbox-19370/apps/playback.c rockbox-19370-notempcue/apps/playback.c
--- rockbox-19370/apps/playback.c	2008-12-09 12:28:40.000000000 -0500
+++ rockbox-19370-notempcue/apps/playback.c	2008-12-13 23:40:32.578600000 -0500
@@ -1727,23 +1727,6 @@
     size_t offset = 0;
     bool start_play = start_play_g;
 
-#if 0
-    if (cuesheet_is_enabled() && tracks[track_widx].id3.cuesheet_type == 1)
-    {
-        char cuepath[MAX_PATH];
-
-        struct cuesheet *cue = start_play ? curr_cue : temp_cue;
-
-        if (look_for_cuesheet_file(trackname, cuepath) &&
-            parse_cuesheet(cuepath, cue))
-        {
-            strcpy((cue)->audio_filename, trackname);
-            if (start_play)
-                cue_spoof_id3(curr_cue, &tracks[track_widx].id3);
-        }
-    }
-#endif
-
     track_load_started = false;
 
     if (tracks[track_widx].id3_hid < 0) {
diff -ur rockbox-19370/utils/wpseditor/libwps/src/dummies.c rockbox-19370-notempcue/utils/wpseditor/libwps/src/dummies.c
--- rockbox-19370/utils/wpseditor/libwps/src/dummies.c	2008-12-09 12:29:16.000000000 -0500
+++ rockbox-19370-notempcue/utils/wpseditor/libwps/src/dummies.c	2008-12-13 23:42:38.830400000 -0500
@@ -30,7 +30,6 @@
 struct gui_wps gui_wps[NB_SCREENS];
 struct wps_data wps_datas[NB_SCREENS];
 struct cuesheet *curr_cue;
-struct cuesheet *temp_cue;
 struct system_status global_status;
 struct gui_syncstatusbar statusbars;
 struct playlist_info current_playlist;
diff -ur rockbox-19370/utils/wpseditor/libwps/src/dummies.h rockbox-19370-notempcue/utils/wpseditor/libwps/src/dummies.h
--- rockbox-19370/utils/wpseditor/libwps/src/dummies.h	2008-12-09 12:29:16.000000000 -0500
+++ rockbox-19370-notempcue/utils/wpseditor/libwps/src/dummies.h	2008-12-13 23:42:35.460800000 -0500
@@ -40,7 +40,6 @@
 extern struct gui_wps gui_wps[NB_SCREENS];
 extern struct wps_data wps_datas[NB_SCREENS];
 extern struct cuesheet *curr_cue;
-extern struct cuesheet *temp_cue;
 extern struct system_status global_status;
 extern struct gui_syncstatusbar statusbars;
 extern struct playlist_info current_playlist;