From: <tj...@us...> - 2010-06-27 12:59:20
|
Revision: 13409 http://alleg.svn.sourceforge.net/alleg/?rev=13409&view=rev Author: tjaden Date: 2010-06-27 12:59:14 +0000 (Sun, 27 Jun 2010) Log Message: ----------- Remove the dummy_display as having a NULL current display should be considered valid. Modified Paths: -------------- allegro/branches/4.9/include/allegro5/internal/aintern_system.h allegro/branches/4.9/src/display.c allegro/branches/4.9/src/system.c Modified: allegro/branches/4.9/include/allegro5/internal/aintern_system.h =================================================================== --- allegro/branches/4.9/include/allegro5/internal/aintern_system.h 2010-06-27 12:58:28 UTC (rev 13408) +++ allegro/branches/4.9/include/allegro5/internal/aintern_system.h 2010-06-27 12:59:14 UTC (rev 13409) @@ -42,7 +42,6 @@ ALLEGRO_SYSTEM_INTERFACE *vt; _AL_VECTOR displays; /* Keep a list of all displays attached to us. */ ALLEGRO_CONFIG *config; - ALLEGRO_DISPLAY *dummy_display; }; Modified: allegro/branches/4.9/src/display.c =================================================================== --- allegro/branches/4.9/src/display.c 2010-06-27 12:58:28 UTC (rev 13408) +++ allegro/branches/4.9/src/display.c 2010-06-27 12:59:14 UTC (rev 13409) @@ -108,7 +108,6 @@ void al_destroy_display(ALLEGRO_DISPLAY *display) { if (display) { - ALLEGRO_SYSTEM *sysdrv; ALLEGRO_BITMAP *bmp; bmp = al_get_target_bitmap(); @@ -122,11 +121,6 @@ display->display_invalidated(display, true); display->vt->destroy_display(display); - - sysdrv = al_get_system_driver(); - if (sysdrv->displays._size <= 0) { - al_set_current_display(sysdrv->dummy_display); - } } } Modified: allegro/branches/4.9/src/system.c =================================================================== --- allegro/branches/4.9/src/system.c 2010-06-27 12:58:28 UTC (rev 13408) +++ allegro/branches/4.9/src/system.c 2010-06-27 12:59:14 UTC (rev 13409) @@ -88,7 +88,6 @@ { if (active_sysdrv) { ALLEGRO_CONFIG *temp = active_sysdrv->config; - al_free(active_sysdrv->dummy_display); if (active_sysdrv->vt && active_sysdrv->vt->shutdown_system) active_sysdrv->vt->shutdown_system(); active_sysdrv = NULL; @@ -251,10 +250,6 @@ atexit_virgin = false; } - /* Create a dummy dispay so command line tools work */ - active_sysdrv->dummy_display = al_calloc(1, sizeof(ALLEGRO_DISPLAY)); - al_set_current_display(active_sysdrv->dummy_display); - /* Clear errnos set while searching for config files. */ al_set_errno(0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |