Improved error handling when loading bezels

src/common/Bezel.cxx

@@ -56,6 +56,11 @@ const string Bezel::getName(int& index) const
   }
 
   if(index == 10)
+  {
+    return "Atari-2600";
+  }
+
+  if(index == 11)
   {
     index = -1;
     return "default";
@@ -88,6 +93,7 @@ bool Bezel::load()
 {
   const Settings& settings = myOSystem.settings();
   bool isValid = false;
+  string imageName = "";
 
 #ifdef IMAGE_SUPPORT
   const bool show = myOSystem.eventHandler().inTIAMode() &&
@@ -102,22 +108,21 @@ bool Bezel::load()
     try
     {
       const string& path = myOSystem.bezelDir().getPath();
-      string imageName;
       VariantList metaData;
       int index = 0;
 
       do
       {
-        const string& name = getName(index);
-        if(name != EmptyString)
+        imageName = getName(index);
+        if(imageName != EmptyString)
         {
           // Note: JPG does not support transparency
-          imageName = path + name + ".png";
-          FSNode node(imageName);
+          const string imagePath = path + imageName + ".png";
+          FSNode node(imagePath);
           if(node.exists())
           {
             isValid = true;
-            myOSystem.png().loadImage(imageName, *mySurface, metaData);
+            myOSystem.png().loadImage(imagePath, *mySurface, metaData);
             break;
           }
         }
@@ -160,14 +165,24 @@ bool Bezel::load()
     //  << double((int)(right - left + 1)) / double((int)(bottom - top + 1));
 
     // Disable bezel is no transparent window was found
-    if (left < right && top < bottom)
+    if(left < right && top < bottom)
       myInfo = Info(Common::Size(w, h), Common::Rect(left, top, right, bottom));
     else
+    {
+      if(mySurface)
+        myFB.deallocateSurface(mySurface);
+      mySurface = nullptr;
       myInfo = Info();
+      myFB.showTextMessage("Invalid bezel image ('" + imageName + "')!");
+      isValid = false;
+    }
   }
   else
+  {
     myInfo = Info();
-
+    if(show)
+      myFB.showTextMessage("No bezel image found");
+  }
   return isValid;
 }
 

src/emucore/FrameBuffer.cxx

@@ -1283,7 +1283,6 @@ void FrameBuffer::toggleBezel(bool toggle)
       if(!myBezel->load() && enabled)
       {
         myOSystem.settings().setValue("bezel.show", !enabled);
-        myOSystem.frameBuffer().showTextMessage("No bezel image found");
         return;
       }
       else
@@ -1489,7 +1488,7 @@ void FrameBuffer::toggleGrabMouse(bool toggle)
     kBGColor          Normal background color (non-text)
     kBGColorLo        Disabled background color dark (non-text)
     kBGColorHi        Disabled background color light (non-text)
-    kShadowColor      Item is disabled
+    kShadowColor      Item is disabled (unused)
     *** Text colors ***
     kTextColor        Normal text color
     kTextColorHi      Highlighted text color
@@ -1577,6 +1576,6 @@ UIPaletteArray FrameBuffer::ourDarkUIPalette = {
     0x3c3c3c, 0x646464,                                         // scrollbar
     0x7f2020, 0xc0c0c0, 0xe00000, 0xc00000,                     // debugger
     0x989898, 0x0059a3, 0x3c3c3c, 0x000000, 0x3c3c3c,           // slider
-    0x000000, 0x989898, 0x202020                                // other
+    0x000000, 0x404040, 0xc0c0c0                                // other
   }
 };