1 files changed, 12 insertions, 9 deletions

diff --git a/apps/plugins/xworld/sys.c b/apps/plugins/xworld/sys.c
index 0bd1e0dc08..c57da9456b 100644
--- a/apps/plugins/xworld/sys.c
+++ b/apps/plugins/xworld/sys.c
@@ -40,6 +40,7 @@
 #include "engine.h"
 
 static struct System* save_sys;
+static fb_data *lcd_fb = NULL;
 
 static bool sys_save_settings(struct System* sys)
 {
@@ -438,6 +439,8 @@ void sys_init(struct System* sys, const char* title)
     {
         sys_reset_settings(sys);
     }
+    struct viewport *vp_main = rb->lcd_set_viewport(NULL);
+    lcd_fb = vp_main->buffer->fb_ptr;
 }
 
 void sys_destroy(struct System* sys)
@@ -584,7 +587,7 @@ void sys_copyRect(struct System* sys, uint16_t x, uint16_t y, uint16_t w, uint16
         struct bitmap out_bmp;
         out_bmp.width = LCD_WIDTH;
         out_bmp.height = LCD_HEIGHT;
-        out_bmp.data = (unsigned char*) *rb->lcd_framebuffer;
+        out_bmp.data = (unsigned char*) lcd_fb;
 
 #ifdef HAVE_LCD_COLOR
         if(sys->settings.scaling_quality == 1)
@@ -631,25 +634,25 @@ void sys_copyRect(struct System* sys, uint16_t x, uint16_t y, uint16_t w, uint16
             {
 #ifdef HAVE_LCD_COLOR
                 int r, g, b;
-                fb_data pix = *rb->lcd_framebuffer[y * LCD_WIDTH + x];
+                fb_data pix = lcd_fb[y * LCD_WIDTH + x];
 #if (LCD_DEPTH > 24)
                 r = 0xff - pix.r;
                 g = 0xff - pix.g;
                 b = 0xff - pix.b;
-                *rb->lcd_framebuffer[y * LCD_WIDTH + x] = (fb_data) { b, g, r, 255 };
+                lcd_fb[y * LCD_WIDTH + x] = (fb_data) { b, g, r, 255 };
 #elif (LCD_DEPTH == 24)
                 r = 0xff - pix.r;
                 g = 0xff - pix.g;
                 b = 0xff - pix.b;
-                *rb->lcd_framebuffer[y * LCD_WIDTH + x] = (fb_data) { b, g, r };
+                lcd_fb[y * LCD_WIDTH + x] = (fb_data) { b, g, r };
 #else
                 r = RGB_UNPACK_RED  (pix);
                 g = RGB_UNPACK_GREEN(pix);
                 b = RGB_UNPACK_BLUE (pix);
-                *rb->lcd_framebuffer[y * LCD_WIDTH + x] = LCD_RGBPACK(0xff - r, 0xff - g, 0xff - b);
+                lcd_fb[y * LCD_WIDTH + x] = LCD_RGBPACK(0xff - r, 0xff - g, 0xff - b);
 #endif
 #else
-                *rb->lcd_framebuffer[y * LCD_WIDTH + x] = LCD_BRIGHTNESS(0xff - *rb->lcd_framebuffer[y * LCD_WIDTH + x]);
+                lcd_fb[y * LCD_WIDTH + x] = LCD_BRIGHTNESS(0xff - lcd_fb[y * LCD_WIDTH + x]);
 #endif
             }
         }
@@ -671,14 +674,14 @@ void sys_copyRect(struct System* sys, uint16_t x, uint16_t y, uint16_t w, uint16
         if(prev_frames && orig_fb)
         {
 
-            rb->memcpy(orig_fb, *rb->lcd_framebuffer, sizeof(fb_data) * LCD_WIDTH * LCD_HEIGHT);
+            rb->memcpy(orig_fb, lcd_fb, sizeof(fb_data) * LCD_WIDTH * LCD_HEIGHT);
             /* fancy useless slow motion blur */
             for(int y = 0; y < LCD_HEIGHT; ++y)
             {
                 for(int x = 0; x < LCD_WIDTH; ++x)
                 {
                     int r, g, b;
-                    fb_data pix = *rb->lcd_framebuffer[y * LCD_WIDTH + x];
+                    fb_data pix = lcd_fb[y * LCD_WIDTH + x];
                     r = RGB_UNPACK_RED  (pix);
                     g = RGB_UNPACK_GREEN(pix);
                     b = RGB_UNPACK_BLUE (pix);
@@ -695,7 +698,7 @@ void sys_copyRect(struct System* sys, uint16_t x, uint16_t y, uint16_t w, uint16
                     r /= (BLUR_FRAMES + 1) / 2 * (1 + BLUR_FRAMES + 1);
                     g /= (BLUR_FRAMES + 1) / 2 * (1 + BLUR_FRAMES + 1);
                     b /= (BLUR_FRAMES + 1) / 2 * (1 + BLUR_FRAMES + 1);
-                    *rb->lcd_framebuffer[y * LCD_WIDTH + x] = LCD_RGBPACK(r, g, b);
+                    lcd_fb[y * LCD_WIDTH + x] = LCD_RGBPACK(r, g, b);
                 }
             }
             prev_baseidx -= LCD_WIDTH * LCD_HEIGHT;