PCem

changeset 125:0aa71a22757b

find changesets by author, revision, files, or words in the commit message
Fixed hang when opening status window.
author TomW
date Fri Jul 11 20:52:18 2014 +0100
parents 457f666b38c1
children eec15469acb3
files src/vid_svga.c src/win-status.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line diff
     1.1 --- a/src/vid_svga.c	Fri Jul 11 20:35:37 2014 +0100
     1.2 +++ b/src/vid_svga.c	Fri Jul 11 20:52:18 2014 +0100
     1.3 @@ -1367,12 +1367,11 @@
     1.4          svga_t *svga = (svga_t *)p;
     1.5          char temps[128];
     1.6          int cur_len = max_len;
     1.7 -        int len;
     1.8          
     1.9          if (svga->chain4) strcpy(temps, "SVGA chained (possibly mode 13h)\n");
    1.10          else              strcpy(temps, "SVGA unchained (possibly mode-X)\n");
    1.11          strncat(s, temps, cur_len);
    1.12 -        cur_len -= len;
    1.13 +        cur_len -= strlen(temps);
    1.14  
    1.15          if (!svga->video_bpp) strcpy(temps, "SVGA in text mode\n");
    1.16          else                  sprintf(temps, "SVGA colour depth : %i bpp\n", svga->video_bpp);

     2.1 --- a/src/win-status.c	Fri Jul 11 20:35:37 2014 +0100
     2.2 +++ b/src/win-status.c	Fri Jul 11 20:52:18 2014 +0100
     2.3 @@ -4,6 +4,7 @@
     2.4  #undef BITMAP
     2.5  
     2.6  #include "ibm.h"
     2.7 +#include "device.h"
     2.8  #include "video.h"
     2.9  #include "resources.h"
    2.10  #include "win.h"