From 16e1f256c226834d5c8c28506b1a58cf3f527884 Mon Sep 17 00:00:00 2001
From: Thomas Jentzsch <tjentzsch@yahoo.de>
Date: Tue, 4 Feb 2020 16:30:05 +0100
Subject: [PATCH] fix CartMDMWidget (disable bank selection popup when locked)

---
 src/debugger/gui/CartMDMWidget.cxx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/debugger/gui/CartMDMWidget.cxx b/src/debugger/gui/CartMDMWidget.cxx
index 3508ad238..7b0f799e4 100644
--- a/src/debugger/gui/CartMDMWidget.cxx
+++ b/src/debugger/gui/CartMDMWidget.cxx
@@ -47,14 +47,14 @@ CartridgeMDMWidget::CartridgeMDMWidget(
   }
 
   myBank =
-    new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("xxx ($0FFF)"),
+    new PopUpWidget(boss, _font, xpos, ypos, _font.getStringWidth("xxx ($0FFF)"),
                     myLineHeight, items, "Set bank     ",
                     0, kBankChanged);
   myBank->setTarget(this);
   addFocusWidget(myBank);
 
   xpos += myBank->getWidth() + 30;
-  myBankDisabled = new CheckboxWidget(boss, _font, xpos, ypos,
+  myBankDisabled = new CheckboxWidget(boss, _font, xpos, ypos + 1,
                                       "Bankswitching is locked/disabled",
                                       kBankDisabled);
   myBankDisabled->setTarget(this);
@@ -65,6 +65,7 @@ CartridgeMDMWidget::CartridgeMDMWidget(
 void CartridgeMDMWidget::loadConfig()
 {
   myBank->setSelectedIndex(myCart.getBank());
+  myBank->setEnabled(!myCart.myBankingDisabled);
   myBankDisabled->setState(myCart.myBankingDisabled);
 
   CartDebugWidget::loadConfig();
@@ -84,6 +85,7 @@ void CartridgeMDMWidget::handleCommand(CommandSender* sender,
   else if(cmd == kBankDisabled)
   {
     myCart.myBankingDisabled = myBankDisabled->getState();
+    myBank->setEnabled(!myCart.myBankingDisabled);
   }
 }