--- flashvideo.module	(revision 52)
+++ sites/video.drupal.local/modules/flashvideo/flashvideo.module	(working copy)
@@ -751,6 +751,12 @@
             // db_storage = 0 means 'stored in its own table'.  Single upload fields = 1.  Shared fields and Multi-values = 0.
             db_query("UPDATE {". $cck_finished_thumbnail_field_db_info['table'] ."} SET ". $cck_finished_thumbnail_field_db_info['columns']['fid']['column'] ." = %d, ". $cck_finished_thumbnail_field_db_info['columns']['list']['column'] ." = 0 WHERE nid = %d", $newfile->fid, $newfile->nid);
           }
+          else if (empty($cck_finished_thumbnail_field['multiple'])) {
+            // Get rid of the initial NULL entry.
+            db_query("DELETE FROM {". $cck_finished_thumbnail_field_db_info['table'] ."} WHERE nid = %d AND ". $cck_finished_thumbnail_field_db_info['columns']['fid']['column'] ." IS NULL", $newfile->nid);
+            // The same query as the one below, just without the delta values
+            db_query("INSERT INTO {". $cck_finished_thumbnail_field_db_info['table'] ."} (vid, nid, ". $cck_finished_thumbnail_field_db_info['columns']['fid']['column'] .", ". $cck_finished_thumbnail_field_db_info['columns']['list']['column'] .") VALUES (%d, %d, %d, 0)", $newfile->vid, $newfile->nid, $newfile->fid);
+          }
           else { // For multi-upload file fields
             // Get rid of the initial NULL entry.
             db_query("DELETE FROM {". $cck_finished_thumbnail_field_db_info['table'] ."} WHERE nid = %d AND ". $cck_finished_thumbnail_field_db_info['columns']['fid']['column'] ." IS NULL", $newfile->nid);
@@ -763,6 +769,12 @@
             // db_storage = 0 means 'stored in its own table'.  Single upload fields = 1.  Shared fields and Multi-values = 0.
             db_query("UPDATE {". $cck_finished_video_field_db_info['table'] ."} SET ". $cck_finished_video_field_db_info['columns']['fid']['column'] ." = %d, ". $cck_finished_video_field_db_info['columns']['list']['column'] ." = 0 WHERE nid = %d", $newfile->fid, $newfile->nid);
           }
+          else if (empty($cck_finished_video_field['multiple'])) {
+            // Get rid of the initial NULL entry.
+            db_query("DELETE FROM {". $cck_finished_video_field_db_info['table'] ."} WHERE nid = %d AND ". $cck_finished_video_field_db_info['columns']['fid']['column'] ." IS NULL", $newfile->nid);
+            // The same query as the one below, just without the delta values
+            db_query("INSERT INTO {". $cck_finished_video_field_db_info['table'] ."} (vid, nid, ". $cck_finished_video_field_db_info['columns']['fid']['column'] .", ". $cck_finished_video_field_db_info['columns']['list']['column'] .") VALUES (%d, %d, %d, 0)", $newfile->vid, $newfile->nid, $newfile->fid);
+          }
           else { // For multi-upload file fields
             // Get rid of the initial NULL entry.
             db_query("DELETE FROM {". $cck_finished_video_field_db_info['table'] ."} WHERE nid = %d AND ". $cck_finished_video_field_db_info['columns']['fid']['column'] ." IS NULL", $newfile->nid);
@@ -1433,6 +1445,12 @@
           if ($cck_original_video_field['db_storage'] == 1) {
             db_query("UPDATE {". $cck_original_video_field_db_info['table'] ."} SET ". $cck_original_video_field_db_info['columns']['fid']['column'] ." = %d, ". $cck_original_video_field_db_info['columns']['list']['column'] ." = 0 WHERE nid = %d", $tempfile->fid, $node->nid);
           }
+          else if (empty($cck_original_video_field['multiple'])) {
+            // Get rid of the initial NULL entry.
+            db_query("DELETE FROM {". $cck_original_video_field_db_info['table'] ."} WHERE nid = %d AND ". $cck_original_video_field_db_info['columns']['fid']['column'] ." IS NULL", $node->nid);
+            // The same query as the one below, just without the delta values
+            db_query("INSERT INTO {". $cck_original_video_field_db_info['table'] ."} (vid, nid, ". $cck_original_video_field_db_info['columns']['fid']['column'] .", ". $cck_original_video_field_db_info['columns']['list']['column'] .") VALUES (%d, %d, %d, 0)", $node->nid, $node->nid, $tempfile->fid);
+          }
           else { // For multi-upload file fields
             // Get rid of the initial NULL entry.
             db_query("DELETE FROM {". $cck_original_video_field_db_info['table'] ."} WHERE nid = %d AND ". $cck_original_video_field_db_info['columns']['fid']['column'] ." IS NULL", $node->nid);
@@ -1586,16 +1604,16 @@
             // Get the size of the video.  Width and Height.
             $size = flashvideo_get_size($node, $file);
             // See if we need to adjust the index to account for previously-uploaded videos.
-            $video_index = (!empty($node->$cck_finished_video_field['field_name']) && is_array($node->$cck_finished_video_field['field_name'])) ? count($node->$cck_finished_video_field['field_name']) - 1 : $video_index;
+            //$video_index = (!empty($node->$cck_finished_video_field['field_name']) && is_array($node->$cck_finished_video_field['field_name'])) ? count($node->$cck_finished_video_field['field_name']) - 1 : $video_index;
             // Now insert our flashvideo into our table.
             db_query("INSERT INTO {flashvideo} (fid, nid, oid, status, video_index, width, height, flags) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)", $file->fid, $node->nid, $file->fid, FLASHVIDEO_STATUS_OK, $video_index, $size['width'], $size['height'], 0);
              // If we don't want to wait for cron, call it immediately.
             if (flashvideo_variable_get($node->type, 'convert', 0)) {
               flashvideo_cron();
             }
+            // Increment the video index.
+            $video_index++;            
           }
-          // Increment the video index.
-          $video_index++;
         }
       }
     }