From a12865277b2cb4307846d66d4f46c9e5e6b1e3fd Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 10 Apr 2020 20:56:28 +0200
Subject: [PATCH] Cosmetics

---
 radio/src/thirdparty/libopenui/src/bitmapbuffer.h | 14 ++++++++------
 radio/src/thirdparty/libopenui/src/carousel.h     |  7 +++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer.h b/radio/src/thirdparty/libopenui/src/bitmapbuffer.h
index c50db7c13..18e70039d 100755
--- a/radio/src/thirdparty/libopenui/src/bitmapbuffer.h
+++ b/radio/src/thirdparty/libopenui/src/bitmapbuffer.h
@@ -491,13 +491,15 @@ class BitmapBuffer: public BitmapBufferBase<pixel_t>
     template<class T>
     void drawScaledBitmap(const T * bitmap, coord_t x, coord_t y, coord_t w, coord_t h)
     {
-      float vscale = float(h) / bitmap->height();
-      float hscale = float(w) / bitmap->width();
-      float scale = vscale < hscale ? vscale : hscale;
+      if (bitmap) {
+        float vscale = float(h) / bitmap->height();
+        float hscale = float(w) / bitmap->width();
+        float scale = vscale < hscale ? vscale : hscale;
 
-      int xshift = (w - (bitmap->width() * scale)) / 2;
-      int yshift = (h - (bitmap->height() * scale)) / 2;
-      drawBitmap(x + xshift, y + yshift, bitmap, 0, 0, 0, 0, scale);
+        int xshift = (w - (bitmap->width() * scale)) / 2;
+        int yshift = (h - (bitmap->height() * scale)) / 2;
+        drawBitmap(x + xshift, y + yshift, bitmap, 0, 0, 0, 0, scale);
+      }
     }
 
     BitmapBuffer * horizontalFlip() const;
diff --git a/radio/src/thirdparty/libopenui/src/carousel.h b/radio/src/thirdparty/libopenui/src/carousel.h
index dc75cf0af..342233c27 100644
--- a/radio/src/thirdparty/libopenui/src/carousel.h
+++ b/radio/src/thirdparty/libopenui/src/carousel.h
@@ -33,6 +33,8 @@ class CarouselItem {
     {
     }
 
+    virtual ~CarouselItem() = default;
+
   public:
     Window * front;
     Window * back;
@@ -49,10 +51,7 @@ class CarouselWindow: public Window {
 
     ~CarouselWindow() override
     {
-      for (auto & item: items) {
-        item->front->deleteLater();
-        item->back->deleteLater();
-      }
+      clear();
     }
 
     void addItem(CarouselItem * item)