# HG changeset patch # User nkeynes # Date 1224750647 0 # Node ID a9896953e9a134fc84f6e6992685726c35269d66 # Parent 5baaea6d972213ab2ce47e9c0bc4201ab079675e Fix save-state load in headless mode --- a/src/pvr2/pvr2.c Mon Oct 20 06:19:07 2008 +0000 +++ b/src/pvr2/pvr2.c Thu Oct 23 08:30:47 2008 +0000 @@ -212,12 +212,14 @@ } -render_buffer_t pvr2_load_render_buffer( FILE *f ) +render_buffer_t pvr2_load_render_buffer( FILE *f, gboolean *status ) { frame_buffer_t frame = read_png_from_stream( f ); if( frame == NULL ) { + *status = FALSE; return NULL; } + *status = TRUE; render_buffer_t buffer = pvr2_frame_buffer_to_render_buffer(frame); if( buffer != NULL ) { @@ -263,6 +265,7 @@ gboolean pvr2_load_render_buffers( FILE *f ) { uint32_t count, has_frontbuffer; + gboolean loadok; int i; fread( &count, sizeof(count), 1, f ); @@ -277,15 +280,17 @@ render_buffer_count = 0; if( has_frontbuffer ) { - displayed_render_buffer = pvr2_load_render_buffer(f); - if( displayed_render_buffer == NULL ) - return FALSE; - display_driver->display_render_buffer( displayed_render_buffer ); + displayed_render_buffer = pvr2_load_render_buffer(f, &loadok); + if( displayed_render_buffer != NULL ) + display_driver->display_render_buffer( displayed_render_buffer ); + else if( !loadok ) + return FALSE; count--; } for( i=0; i