Ticket #7795: filezilla_3.5.1_queue_save.patch

FileZilla3/src/interface/queue_storage.cpp

@@ -694 +694 @@
     if (ret)
     {
         sqlite3_int64 serverId = sqlite3_last_insert_rowid(db_);
-        Bind(insertFileQuery_, file_table_column_names::server, serverId);
+        // insertFileQuery_ will be reset in SaveFile(), we assign this value after reset it
+        //Bind(insertFileQuery_, file_table_column_names::server, serverId);
 
         const std::vector<CQueueItem*>& children = item.GetChildren();
         for (std::vector<CQueueItem*>::const_iterator it = children.begin() + item.GetRemovedAtFront(); it != children.end(); ++it)
@@ -717 +718 @@
 
     sqlite3_reset(insertFileQuery_);
 
+    // assign server id here
+    Bind(insertFileQuery_, file_table_column_names::server, server.GetValue());
     Bind(insertFileQuery_, file_table_column_names::source_file, file.GetSourceFile());
     if (file.GetTargetFile().empty())
         BindNull(insertFileQuery_, file_table_column_names::target_file);
@@ -761 +764 @@
 {
     sqlite3_reset(insertFileQuery_);
 
+    // assign server id here
+    Bind(insertFileQuery_, file_table_column_names::server, server.GetValue());
     if (download)
         BindNull(insertFileQuery_, file_table_column_names::source_file);
     else