Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix FS#8656 - Error saving non-current playlist file

Browse source 
Use the plugin buffer to save the playlist copy if there isnt enough buffer already allocated to the inram copy of the playlist

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30184 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2011-07-21 06:40:21 +00:00
parent a7c37ea2d0
commit d1fd4f08f5
46 changed files with 217 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/lang/arabic.lang
View file

@ -3404,19 +3404,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "حفظ التغييرات ؟"
radio: ""
</dest>
<voice>
*: none
radio: "Save Changes?"
radio: ""
</voice>
</phrase>
<phrase>

6
apps/lang/bulgarian.lang
View file

@ -1986,15 +1986,15 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Запазване на промените?"
radio: ""
</dest>
<voice>
*: none

8
apps/lang/catala.lang
View file

@ -5375,19 +5375,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Desa els Canvis?"
radio: ""
</dest>
<voice>
*: none
radio: "Desa els Canvis?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/chinese-simp.lang
View file

@ -7523,19 +7523,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "保存变动?"
radio: ""
</dest>
<voice>
*: none
radio: "保存变动吗"
radio: ""
</voice>
</phrase>
<phrase>

6
apps/lang/chinese-trad.lang
View file

@ -7532,15 +7532,15 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "儲存變動?"
radio: ""
</dest>
<voice>
*: none

8
apps/lang/czech.lang
View file

@ -5383,19 +5383,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Uložit změny?"
radio: ""
</dest>
<voice>
*: none
radio: "Uložit změny?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/dansk.lang
View file

@ -6595,19 +6595,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Gem ændringer?"
radio: ""
</dest>
<voice>
*: none
radio: "Vil du gemme ændringer?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/deutsch.lang
View file

@ -5385,19 +5385,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Änderungen speichern?"
radio: ""
</dest>
<voice>
*: none
radio: "Änderungen speichern?"
radio: ""
</voice>
</phrase>
<phrase>

6
apps/lang/eesti.lang
View file

@ -7046,13 +7046,13 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: "Save Changes?"
*: ""
</source>
<dest>
*: "Save Changes?"
*: ""
</dest>
<voice>
*: ""

8
apps/lang/english-us.lang
View file

@ -5382,19 +5382,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Save Changes?"
radio: ""
</dest>
<voice>
*: none
radio: "Save Changes?"
radio: ""
</voice>
</phrase>
<phrase>

22
apps/lang/english.lang
View file

@ -5466,19 +5466,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Save Changes?"
radio: ""
</dest>
<voice>
*: none
radio: "Save Changes?"
radio: ""
</voice>
</phrase>
<phrase>
@ -12799,3 +12799,17 @@
*: "Current Playlist"
</voice>
</phrase>
<phrase>
id: LANG_SAVE_CHANGES
desc: When you try to exit screens to confirm save
user: core
<source>
*: "Save Changes?"
</source>
<dest>
*: "Save Changes?"
</dest>
<voice>
*: "Save Changes?"
</voice>
</phrase>

8
apps/lang/espanol.lang
View file

@ -5676,19 +5676,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "¿Guardar cambios?"
radio: ""
</dest>
<voice>
*: none
radio: "¿Guardar cambios?"
radio: ""
</voice>
</phrase>
<phrase>

6
apps/lang/esperanto.lang
View file

@ -7249,13 +7249,13 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: "Save Changes?"
*: ""
</source>
<dest>
*: "Savi Ŝanĝojn?"
*: ""
</dest>
<voice>
*: ""

8
apps/lang/finnish.lang
View file

@ -7529,19 +7529,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Tallennetaanko muutokset?"
radio: ""
</dest>
<voice>
*: none
radio: "Tallennetaanko muutokset?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/francais.lang
View file

@ -5409,19 +5409,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Sauvegarder les changements ?"
radio: ""
</dest>
<voice>
*: none
radio: "Sauvegarder les changements ?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/galego.lang
View file

@ -5843,19 +5843,19 @@ iriverifp7xx: "%d%% %dh %dm"
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Gardar cambios?"
radio: ""
</dest>
<voice>
*: none
radio: "Gardar cambios?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/greek.lang
View file

@ -5352,19 +5352,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Αποθήκευση αλλαγών;"
radio: ""
</dest>
<voice>
*: none
radio: "Αποθήκευση αλλαγών;"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/hebrew.lang
View file

@ -5390,19 +5390,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "?לשמור שינויים"
radio: ""
</dest>
<voice>
*: none
radio: "לשמור שינויים?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/hindi.lang
View file

@ -2542,19 +2542,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Changes बचा?"
radio: ""
</dest>
<voice>
*: none
radio: "Changes बचा?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/hrvatski.lang
View file

@ -5382,19 +5382,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Spremiti promjene?"
radio: ""
</dest>
<voice>
*: none
radio: "Spremiti promjene?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/islenska.lang
View file

@ -6194,19 +6194,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Vista breytingar?"
radio: ""
</dest>
<voice>
*: none
radio: "Save Changes?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/italiano.lang
View file

@ -5384,19 +5384,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Salvare le modifiche?"
radio: ""
</dest>
<voice>
*: none
radio: "Salvare le modifiche?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/japanese.lang
View file

@ -5388,19 +5388,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "プリセットを保存しますか?"
radio: ""
</dest>
<voice>
*: none
radio: "プリセットを保存しますか?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/korean.lang
View file

@ -7528,19 +7528,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "변경사항을 저장할까요?"
radio: ""
</dest>
<voice>
*: none
radio: "변경사항을 저장할까요?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/latviesu.lang
View file

@ -5382,19 +5382,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Saglabāt Izmaiņas?"
radio: ""
</dest>
<voice>
*: none
radio: "Saglabāt Izmaiņas?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/lietuviu.lang
View file

@ -5440,19 +5440,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Išsaugoti pakeitimus?"
radio: ""
</dest>
<voice>
*: none
radio: "Išsaugoti pakeitimus?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/magyar.lang
View file

@ -5358,19 +5358,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Mentsem a változtatásokat?"
radio: ""
</dest>
<voice>
*: none
radio: "Save Changes?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/nederlands.lang
View file

@ -7525,19 +7525,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Verandering opslaan?"
radio: ""
</dest>
<voice>
*: none
radio: "Verandering opslaan?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/norsk-nynorsk.lang
View file

@ -7418,19 +7418,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Vil du lagra endringane?"
radio: ""
</dest>
<voice>
*: none
radio: "Vil du lagra endringane?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/norsk.lang
View file

@ -6597,19 +6597,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Lagre endringer?"
radio: ""
</dest>
<voice>
*: none
radio: "Lagre endringer?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/polski.lang
View file

@ -5392,19 +5392,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Zapisać zmiany?"
radio: ""
</dest>
<voice>
*: none
radio: "Zapisać zmiany?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/portugues-brasileiro.lang
View file

@ -5382,19 +5382,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Gravar Mudanças?"
radio: ""
</dest>
<voice>
*: none
radio: "Gravar Mudanças?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/portugues.lang
View file

@ -9515,19 +9515,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Guardar Alterações?"
radio: ""
</dest>
<voice>
*: none
radio: "Guardar Alterações?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/romaneste.lang
View file

@ -2327,19 +2327,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Salvați modificările?"
radio: ""
</dest>
<voice>
*: none
radio: "Salvați modificările?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/russian.lang
View file

@ -7284,19 +7284,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Сохранить изменения?"
radio: ""
</dest>
<voice>
*: none
radio: "Сохранить изменения?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/slovak.lang
View file

@ -5382,19 +5382,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Uložiť Zmeny?"
radio: ""
</dest>
<voice>
*: none
radio: "Uložiť Zmeny?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/slovenscina.lang
View file

@ -2661,19 +2661,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Save Changes?"
radio: ""
</dest>
<voice>
*: none
radio: "Save Changes?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/srpski.lang
View file

@ -5364,19 +5364,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Да снимим промене?"
radio: ""
</dest>
<voice>
*: none
radio: "Да снимим промене?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/svenska.lang
View file

@ -5385,19 +5385,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Spara ändringar?"
radio: ""
</dest>
<voice>
*: none
radio: "Spara ändringar?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/tagalog.lang
View file

@ -5366,19 +5366,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Mag-ipon palitan?"
radio: ""
</dest>
<voice>
*: none
radio: "Save Changes?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/thai.lang
View file

@ -5346,19 +5346,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "บันทึกการเปลี่ยนแปลง?"
radio: ""
</dest>
<voice>
*: none
radio: "Save Changes?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/ukrainian.lang
View file

@ -5375,19 +5375,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Зберегти Змiни?"
radio: ""
</dest>
<voice>
*: none
radio: "Зберегти Змiни?"
radio: ""
</voice>
</phrase>
<phrase>

8
apps/lang/walon.lang
View file

@ -5386,19 +5386,19 @@
</phrase>
<phrase>
id: LANG_FM_SAVE_CHANGES
desc: When you try to exit radio to confirm save
desc: deprecated
user: core
<source>
*: none
radio: "Save Changes?"
radio: ""
</source>
<dest>
*: none
radio: "Schaper les candjmints ?"
radio: ""
</dest>
<voice>
*: none
radio: "Schaper les candjmints ?"
radio: ""
</voice>
</phrase>
<phrase>

22
apps/playlist.c
View file

@ -103,6 +103,7 @@
#include "splash.h"
#include "rbunicode.h"
#include "root_menu.h"
#include "plugin.h" /* To borrow a temp buffer to rewrite a .m3u8 file */
#define PLAYLIST_CONTROL_FILE_VERSION 2
@ -3369,6 +3370,8 @@ int playlist_save(struct playlist_info* playlist, char *filename)
int result = 0;
bool overwrite_current = false;
int* index_buf = NULL;
char* old_buffer = NULL;
size_t old_buffer_size = 0;
if (!playlist)
playlist = &current_playlist;
@ -3388,9 +3391,18 @@ int playlist_save(struct playlist_info* playlist, char *filename)
if (playlist->buffer_size < (int)(playlist->amount * sizeof(int)))
{
/* not enough buffer space to store updated indices */
/* Try to get a buffer */
old_buffer = playlist->buffer;
old_buffer_size = playlist->buffer_size;
playlist->buffer = plugin_get_buffer((size_t*)&playlist->buffer_size);
if (playlist->buffer_size < (int)(playlist->amount * sizeof(int)))
{
playlist->buffer = old_buffer;
playlist->buffer_size = old_buffer_size;
splash(HZ*2, ID2P(LANG_PLAYLIST_ACCESS_ERROR));
return -1;
}
}
/* in_ram buffer is unused for m3u files so we'll use for storing
updated indices */
@ -3413,6 +3425,11 @@ int playlist_save(struct playlist_info* playlist, char *filename)
if (fd < 0)
{
splash(HZ*2, ID2P(LANG_PLAYLIST_ACCESS_ERROR));
if (old_buffer != NULL)
{
playlist->buffer = old_buffer;
playlist->buffer_size = old_buffer_size;
}
return -1;
}
@ -3513,6 +3530,11 @@ int playlist_save(struct playlist_info* playlist, char *filename)
}
cpu_boost(false);
if (old_buffer != NULL)
{
playlist->buffer = old_buffer;
playlist->buffer_size = old_buffer_size;
}
return result;
}

8
apps/playlist_viewer.c
View file

@ -48,6 +48,7 @@
#include "list.h"
#include "splash.h"
#include "playlist_menu.h"
#include "yesno.h"
/* Maximum number of tracks we can have loaded at one time */
#define MAX_PLAYLIST_ENTRIES 200
@ -634,6 +635,7 @@ enum playlist_viewer_result playlist_viewer_ex(const char* filename)
enum playlist_viewer_result ret = PLAYLIST_VIEWER_OK;
bool exit = false; /* exit viewer */
int button;
bool dirty = false;
struct gui_synclist playlist_lists;
if (!playlist_viewer_init(&viewer, filename, false))
goto exit;
@ -729,6 +731,7 @@ enum playlist_viewer_result playlist_viewer_ex(const char* filename)
update_playlist(true);
viewer.moving_track = -1;
viewer.moving_playlist_index = -1;
dirty = true;
}
else if (!viewer.playlist)
{
@ -784,6 +787,7 @@ enum playlist_viewer_result playlist_viewer_ex(const char* filename)
exit = true;
if (viewer.selected_track >= viewer.num_tracks)
viewer.selected_track = viewer.num_tracks-1;
dirty = true;
}
gui_synclist_draw(&playlist_lists);
break;
@ -803,7 +807,11 @@ enum playlist_viewer_result playlist_viewer_ex(const char* filename)
exit:
if (viewer.playlist)
{
if(dirty && yesno_pop(ID2P(LANG_SAVE_CHANGES)))
save_playlist_screen(viewer.playlist);
playlist_close(viewer.playlist);
}
return ret;
}

6
apps/radio/radio.c
View file

@ -489,7 +489,7 @@ void radio_screen(void)
done = true;
if(presets_have_changed())
{
if(yesno_pop(ID2P(LANG_FM_SAVE_CHANGES)))
if(yesno_pop(ID2P(LANG_SAVE_CHANGES)))
{
presets_save();
}
@ -539,7 +539,7 @@ void radio_screen(void)
done = true;
if(presets_have_changed())
{
if(yesno_pop(ID2P(LANG_FM_SAVE_CHANGES)))
if(yesno_pop(ID2P(LANG_SAVE_CHANGES)))
{
presets_save();
}
@ -705,7 +705,7 @@ void radio_screen(void)
done = true;
if(presets_have_changed())
{
if(yesno_pop(ID2P(LANG_FM_SAVE_CHANGES)))
if(yesno_pop(ID2P(LANG_SAVE_CHANGES)))
{
radio_save_presets();
}