diff options
| author |  Alex Bennee <alex@bennee.com> | 2011-03-28 18:51:07 +0100 |
|---|---|---|
| committer | Alex Bennee <alex@bennee.com> | 2011-03-28 18:51:07 +0100 |
| commit | 6f4b502f1e6be2644ca0d984f918afb802f4116f (patch) | |
| tree | 7d2ef913de7e6c57ae9723caeab031b8330b23ae | |
| parent | 2513a4eabeeb3dd6998e0eb381f04c715fa4ff0f (diff) | |
| parent | 60e9c1ebda68d3fb18c786a94b0e361f6493ccb0 (diff) | |
Merge branch 'master' of git://github.com/cmcginty/easytag
| -rw-r--r-- | src/easytag.c | 2 | ||||
| -rw-r--r-- | src/et_core.c | 5 | ||||
| -rw-r--r-- | src/flac_tag.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/easytag.c b/src/easytag.c index 94c1d60..baac362 100644 --- a/src/easytag.c +++ b/src/easytag.c @@ -2197,7 +2197,7 @@ gint Save_List_Of_Files (GList *etfilelist, gboolean force_saving_files) gchar *msg; gint response; - msg = g_strdup_printf(_("Be careful, severals files (%d file(s)) were changed by an external program.\n" + msg = g_strdup_printf(_("Be careful, several files (%d file(s)) were changed by an external program.\n" "Do you want to continue anyway?"),nb_files_changed_by_ext_program); msgbox = msg_box_new(_("Saving File(s)..."), GTK_WINDOW(MainWindow), diff --git a/src/et_core.c b/src/et_core.c index 567a4bf..d8d1930 100644 --- a/src/et_core.c +++ b/src/et_core.c @@ -3718,6 +3718,11 @@ gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile) } } + // update the stored file modification time to prevent easytag + // from warning that an external program has changed the file + if ( stat(cur_filename,&statbuf)!=-1 ) + ETFile->FileModificationTime = statbuf.st_mtime; + if (state==TRUE) { diff --git a/src/flac_tag.c b/src/flac_tag.c index d8abf2f..19c4c48 100644 --- a/src/flac_tag.c +++ b/src/flac_tag.c @@ -1123,7 +1123,7 @@ gboolean Flac_Tag_Write_File_Tag (ET_File *ETFile) FLAC__metadata_chain_sort_padding(chain); // Write tag - if ( !FLAC__metadata_chain_write(chain, /*padding*/TRUE, /*preserve_file_stats*/TRUE) ) + if ( !FLAC__metadata_chain_write(chain, /*padding*/TRUE, PRESERVE_MODIFICATION_TIME) ) { // Error with "FLAC__metadata_chain_write" FLAC__Metadata_ChainStatus status = FLAC__metadata_chain_status(chain); |