fix issue 644

GeoDaCenter · Mar 8, 2017 · 3fee922 · 3fee922
1 parent bee0a51
commit 3fee922
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 20 deletions.
diff --git a/DialogTools/AutoUpdateDlg.cpp b/DialogTools/AutoUpdateDlg.cpp
@@ -429,29 +429,43 @@ void AutoUpdateDlg::OnOkClick( wxCommandEvent& event )
 
                 } else {
                     file_name = exeDir + file_name;
-                    wxString update_file_name = file_name + ".update";
-                    wxString backup_file_name = file_name + ".backup";
 
-    				wxRemoveFile(backup_file_name);
-                    wxRemoveFile(update_file_name);
-
-                    file_url.Replace(" ", "%20");
-                    if (DownloadUrl(file_url.mb_str(), update_file_name.mb_str())){
-                        // check file size
-                        wxFileName updateFile(update_file_name);
-                        wxULongLong update_size = updateFile.GetSize();
-
-                        if (update_size != size )
-                            throw GdaException("");
+                    wxStructStat strucStat;
+                    wxStat(file_name, &strucStat);
+                    wxFileOffset filelen=strucStat.st_size;
+
+                    // should skip unless some criticle file
+                    if (filelen == size &&
+                        file_name.EndsWith("cache.sqlite") )
+                    {
+                        success = true;
 
-                        // replace the old file
-                        wxRenameFile(file_name, backup_file_name);
-                        wxRenameFile(update_file_name, file_name);
+                    } else {
+
+                        wxString update_file_name = file_name + ".update";
+                        wxString backup_file_name = file_name + ".backup";
 
-    					wxRemoveFile(backup_file_name);
-    					wxRemoveFile(update_file_name);
+        				wxRemoveFile(backup_file_name);
+                        wxRemoveFile(update_file_name);
+
+                        file_url.Replace(" ", "%20");
+                        if (DownloadUrl(file_url.mb_str(), update_file_name.mb_str())){
+                            // check file size
+                            wxFileName updateFile(update_file_name);
+                            wxULongLong update_size = updateFile.GetSize();
+
+                            if (update_size != size )
+                                throw GdaException("");
+
+                            // replace the old file
+                            wxRenameFile(file_name, backup_file_name);
+                            wxRenameFile(update_file_name, file_name);
+
+        					wxRemoveFile(backup_file_name);
+        					wxRemoveFile(update_file_name);
 
-                        success = true;
+                            success = true;
+                        }
                     }
                     progressDlg.Update(current_job++);
                 }

diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@ namespace Gda {
 	const int version_major = 1;
 	const int version_minor = 8;
 	const int version_build = 16;
-	const int version_subbuild = 2;
+	const int version_subbuild = 4;
 	const int version_year = 2017;
 	const int version_month = 3;
 	const int version_day = 1;