m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Safety backup: On recovery, load all images even if it exceeds the normal setting of Backup Pages. On crash, do not attempt to save current visible image if the edited image has multiple layers.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1279 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2010-01-23 18:33:48 +00:00
parent 9933e1fddc
commit bece65fcbb
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
loadsave.c
View File

@ -971,7 +971,9 @@ void Emergency_backup(const char *fname, byte *source, int width, int height, T_
void Image_emergency_backup() void Image_emergency_backup()
{ {
if (Main_backups && Main_backups->Pages && Main_backups->Pages->Nb_layers == 1)
Emergency_backup("a999999.bkp",Main_screen, Main_image_width, Main_image_height, &Main_palette); Emergency_backup("a999999.bkp",Main_screen, Main_image_width, Main_image_height, &Main_palette);
if (Spare_backups && Spare_backups->Pages && Spare_backups->Pages->Nb_layers == 1)
Emergency_backup("b999999.bkp",Spare_screen, Spare_image_width, Spare_image_height, &Spare_palette); Emergency_backup("b999999.bkp",Spare_screen, Spare_image_width, Spare_image_height, &Spare_palette);
} }
@ -1131,6 +1133,16 @@ T_String_list *Backups_main = NULL;
/// A list of files, used for scanning a directory /// A list of files, used for scanning a directory
T_String_list *Backups_spare = NULL; T_String_list *Backups_spare = NULL;
// Settings for safety backup (frequency, numbers, etc)
const int Rotation_safety_backup = 8;
const int Min_interval_for_safety_backup = 30000;
const int Min_edits_for_safety_backup = 10;
const int Max_interval_for_safety_backup = 60000;
const int Max_edits_for_safety_backup = 30;
/// ///
/// Adds a file to Backups_main or Backups_spare lists, if it's a backup. /// Adds a file to Backups_main or Backups_spare lists, if it's a backup.
/// ///
@ -1193,10 +1205,16 @@ byte Process_backups(T_String_list **list)
int i; int i;
char ** files_vector; char ** files_vector;
T_String_list *element; T_String_list *element;
byte backup_max_undo_pages;
if (*list == NULL) if (*list == NULL)
return 0; return 0;
// Save the maximum number of pages
// (It's used in Create_new_page() which gets called on each Load_image)
backup_max_undo_pages = Config.Max_undo_pages;
Config.Max_undo_pages = 99;
// Count files // Count files
nb_files=0; nb_files=0;
element=*list; element=*list;
@ -1240,6 +1258,9 @@ byte Process_backups(T_String_list **list)
free(files_vector); free(files_vector);
files_vector = NULL; files_vector = NULL;
// Restore the maximum number of pages
Config.Max_undo_pages = backup_max_undo_pages;
return nb_files; return nb_files;
} }
@ -1289,14 +1310,6 @@ int Check_recovery(void)
return restored_main || restored_spare; return restored_main || restored_spare;
} }
const int Rotation_safety_backup = 8;
const int Min_interval_for_safety_backup = 30000;
const int Min_edits_for_safety_backup = 10;
const int Max_interval_for_safety_backup = 60000;
const int Max_edits_for_safety_backup = 30;
void Rotate_safety_backups(void) void Rotate_safety_backups(void)
{ {
Uint32 now; Uint32 now;

3
loadsave.h
View File

@ -146,6 +146,9 @@ extern T_Format File_formats[];
/// ///
/// Function which attempts to save backups of the images (main and spare), /// Function which attempts to save backups of the images (main and spare),
/// called in case of SIGSEGV. /// called in case of SIGSEGV.
/// It will save an image only if it has just one layer... otherwise,
/// the risk of flattening a layered image (or saving just one detail layer)
/// is too high.
void Image_emergency_backup(void); void Image_emergency_backup(void);
/// Load an arbitrary SDL_Surface. /// Load an arbitrary SDL_Surface.