From 8b2fbc4fa0b6295ed6ebb2484018e42dc12d1cd0 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Wed, 10 Jul 2013 21:54:12 -0400 Subject: [PATCH] Debugger: minor tweak. Also ensure the custom image list controls are appropriately shown/hidden when enabling the top-level stop on image load setting. --- .../gui/team_window/BreakConditionConfigWindow.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/apps/debugger/user_interface/gui/team_window/BreakConditionConfigWindow.cpp b/src/apps/debugger/user_interface/gui/team_window/BreakConditionConfigWindow.cpp index 3e6f6597e8..e1379aa9ce 100644 --- a/src/apps/debugger/user_interface/gui/team_window/BreakConditionConfigWindow.cpp +++ b/src/apps/debugger/user_interface/gui/team_window/BreakConditionConfigWindow.cpp @@ -430,14 +430,14 @@ void BreakConditionConfigWindow::_UpdateStopImageState() { bool previousStop = fStopOnLoadEnabled; - bool previousCustomImages = fUseCustomImages; + bool previousCustomImages = fUseCustomImages && fStopOnLoadEnabled; fStopOnLoadEnabled = fTeam->StopOnImageLoad(); fStopOnImageLoad->SetValue( fStopOnLoadEnabled ? B_CONTROL_ON : B_CONTROL_OFF); fUseCustomImages = fTeam->StopImageNameListEnabled(); fStopImageConstraints->Menu() - ->ItemAt(fUseCustomImages ? 1 : 0)->SetMarked(true); + ->ItemAt(fTeam->StopImageNameListEnabled() ? 1 : 0)->SetMarked(true); fStopImageNames->MakeEmpty(); const BStringList& imageNames = fTeam->StopImageNames(); @@ -462,8 +462,9 @@ BreakConditionConfigWindow::_UpdateStopImageButtons(bool previousStop, bool previousCustomImages) { fStopImageConstraints->SetEnabled(fStopOnLoadEnabled); - if (!previousCustomImages && fUseCustomImages) + bool showCustomGroup = fUseCustomImages && fStopOnLoadEnabled; + if (!previousCustomImages && showCustomGroup) fCustomImageGroup->Show(); - else if (previousCustomImages && !fUseCustomImages) + else if (previousCustomImages && !showCustomGroup) fCustomImageGroup->Hide(); }