Merge from 1.1.

--HG--
rename : src/xine-utils/xmllexer.h => include/xine/xmllexer.h
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libmpeg2/header.c => src/video_dec/libmpeg2/header.c
rename : src/libmpeg2/mpeg2_internal.h => src/video_dec/libmpeg2/mpeg2_internal.h

1 files changed, 2 insertions, 1 deletions

diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 8f3f9c684..91931eef6 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -1060,7 +1060,7 @@ void xine_config_save (xine_t *xine, const char *filename) {
 
       if (!entry->key[0])
         /* deleted key */
-        continue;
+        goto next;
 
       lprintf ("saving key '%s'\n", entry->key);
 
@@ -1130,6 +1130,7 @@ void xine_config_save (xine_t *xine, const char *filename) {
 	break;
       }
 
+      next:
       entry = entry->next;
     }
     pthread_mutex_unlock(&this->config_lock);