comparison src/audacious/playlist.c @ 4297:40a991213507

check if playlistwin_list is UiSkinnedPlaylist before accessing it contents

4296:f0b9b3c82e01

#include "pluginenum.h"

#include "playlist_evmessages.h"
#include "playlist_evlisteners.h"
#include "ui_skinned_playlist.h"

typedef gint (*PlaylistCompareFunc) (PlaylistEntry * a, PlaylistEntry * b);
typedef void (*PlaylistSaveFunc) (FILE * file);

/* If we manually change the song, p_p_b_j will show us where to go back to */

    if (!playlist)
        return;

    PLAYLIST_LOCK(playlist);
    if (!playlist->position || !playlistwin_list) {
        PLAYLIST_UNLOCK(playlist);
        return;
    }

    pos = g_list_index(playlist->entries, playlist->position);

    if (playlistwin_item_visible(pos)) {
        PLAYLIST_UNLOCK(playlist);
        return;
    }

    bottom = MAX(0, playlist_get_length(playlist) -
                 UI_SKINNED_PLAYLIST(playlistwin_list)->num_visible);
    row = CLAMP(pos - UI_SKINNED_PLAYLIST(playlistwin_list)->num_visible / 2, 0, bottom);
    PLAYLIST_UNLOCK(playlist);
    playlistwin_set_toprow(row);
    g_cond_signal(cond_scan);
}

4297:40a991213507

#include "pluginenum.h"

#include "playlist_evmessages.h"
#include "playlist_evlisteners.h"

typedef gint (*PlaylistCompareFunc) (PlaylistEntry * a, PlaylistEntry * b);
typedef void (*PlaylistSaveFunc) (FILE * file);

/* If we manually change the song, p_p_b_j will show us where to go back to */

    if (!playlist)
        return;

    PLAYLIST_LOCK(playlist);
    if (!playlist->position) {
        PLAYLIST_UNLOCK(playlist);
        return;
    }

    pos = g_list_index(playlist->entries, playlist->position);

    if (playlistwin_item_visible(pos)) {
        PLAYLIST_UNLOCK(playlist);
        return;
    }

    bottom = MAX(0, playlist_get_length(playlist) - playlistwin_list_get_visible_count());
    row = CLAMP(pos - playlistwin_list_get_visible_count() / 2, 0, bottom);
    PLAYLIST_UNLOCK(playlist);
    playlistwin_set_toprow(row);
    g_cond_signal(cond_scan);
}