2 files changed, 19 insertions, 5 deletions

diff --git a/apps/plugins/zxbox/zxvid_16bpp.c b/apps/plugins/zxbox/zxvid_16bpp.c
index f8482e3147..f0e2cee5ac 100644
--- a/apps/plugins/zxbox/zxvid_16bpp.c
+++ b/apps/plugins/zxbox/zxvid_16bpp.c
@@ -33,6 +33,8 @@ static const unsigned _16bpp_colors[32] = {
     LCD_RGBPACK(IB1, IB1, IB0), LCD_RGBPACK(IB1, IB1, IB1),
 };
 
+static fb_data *lcd_fb = NULL;
+
 void init_spect_scr(void)
 {
     int i;
@@ -49,6 +51,11 @@ void init_spect_scr(void)
 
 void update_screen(void)
 {
+    if (!lcd_fb)
+    {
+        struct viewport *vp_main = rb->lcd_set_viewport(NULL);
+        lcd_fb = vp_main->buffer->fb_ptr;
+    }
     fb_data *frameb;
   
     int y=0;
@@ -58,7 +65,7 @@ void update_screen(void)
     byte *scrptr;
     scrptr = (byte *) SPNM(image);
     */
-    frameb = *rb->lcd_framebuffer;
+    frameb = lcd_fb;
     for ( y = 0 ; y < HEIGHT*WIDTH; y++ ){
         frameb[y] = FB_SCALARPACK(_16bpp_colors[(unsigned)sp_image[y]]);
     }
@@ -68,7 +75,7 @@ void update_screen(void)
     int srcx, srcy=0;     /* x / y coordinates in source image */
     unsigned char* image;
     image = sp_image + ( (Y_OFF)*(WIDTH) ) + X_OFF;
-    frameb = *rb->lcd_framebuffer;
+    frameb = lcd_fb;
     for(y = 0; y < LCD_HEIGHT; y++)
     {
         srcx = 0;           /* reset our x counter before each row... */
diff --git a/apps/plugins/zxbox/zxvid_2bpp.c b/apps/plugins/zxbox/zxvid_2bpp.c
index 9772625387..97e6a5de76 100644
--- a/apps/plugins/zxbox/zxvid_2bpp.c
+++ b/apps/plugins/zxbox/zxvid_2bpp.c
@@ -26,6 +26,8 @@ static const unsigned char graylevels[16] = {
     0, 1, 1, 1, 2, 2, 3, 3
 };
 
+static fb_data *lcd_fb = NULL;
+
 void init_spect_scr(void)
 {
     int i;
@@ -41,6 +43,11 @@ void init_spect_scr(void)
 }
 void update_screen(void)
 {
+    if (!lcd_fb)
+    {
+        struct viewport *vp_main = rb->lcd_set_viewport(NULL);
+        lcd_fb = vp_main->buffer->fb_ptr;
+    }
     fb_data *frameb;
     int y=0;
     int x=0;
@@ -51,7 +58,7 @@ void update_screen(void)
 #if LCD_PIXELFORMAT == HORIZONTAL_PACKING
     for(y = 0; y < LCD_HEIGHT; y++)
     {
-        frameb = *rb->lcd_framebuffer + (y) * FB_WIDTH;
+        frameb = lcd_fb + (y) * FB_WIDTH;
         srcx = 0;           /* reset our x counter before each row... */
         for(x = 0; x < LCD_WIDTH; x++)
         {
@@ -67,7 +74,7 @@ void update_screen(void)
     int shift;
     for(y = 0; y < LCD_HEIGHT; y++)
     {
-        frameb = *rb->lcd_framebuffer + (y/4) * LCD_WIDTH;
+        frameb = lcd_fb + (y/4) * LCD_WIDTH;
         srcx = 0;           /* reset our x counter before each row... */
         shift = ((y & 3 ) * 2 );
         mask = ~pixmask[y & 3];
@@ -84,7 +91,7 @@ void update_screen(void)
     int shift;
     for(y = 0; y < LCD_HEIGHT; y++)
     {
-        frameb = *rb->lcd_framebuffer + (y/8) * LCD_WIDTH;
+        frameb = lcd_fb + (y/8) * LCD_WIDTH;
         srcx = 0;           /* reset our x counter before each row... */
         shift = (y & 7);
         mask = ~pixmask[y & 7];