From 5462c5ad3c1b9594952b9b1ebb7aaca2f7de2f2b Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 21 Aug 2019 08:24:54 +0000 Subject: [PATCH] ide: Debuggers: frame up/down disabled when running git-svn-id: svn://ultimatepp.org/upp/trunk@13554 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/Debuggers/Code.cpp | 4 ++-- uppsrc/ide/Debuggers/Debug.cpp | 4 ++++ uppsrc/ide/Debuggers/GdbCmd.cpp | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/uppsrc/ide/Debuggers/Code.cpp b/uppsrc/ide/Debuggers/Code.cpp index aefb19516..efa96a8ad 100644 --- a/uppsrc/ide/Debuggers/Code.cpp +++ b/uppsrc/ide/Debuggers/Code.cpp @@ -92,8 +92,8 @@ void Pdb::SetThread() void Pdb::SetFrame() { int fi = ~framelist; - frame_up.Enable(fi > 0); - frame_down.Enable(fi < framelist.GetCount() - 1); + frame_up.Enable(fi > 0 && lock == 0); + frame_down.Enable(fi < framelist.GetCount() - 1 && lock == 0); if(fi >= 0 && fi < frame.GetCount()) { Frame& f = frame[fi]; current_frame = &f; diff --git a/uppsrc/ide/Debuggers/Debug.cpp b/uppsrc/ide/Debuggers/Debug.cpp index 59887561e..9fe75c040 100644 --- a/uppsrc/ide/Debuggers/Debug.cpp +++ b/uppsrc/ide/Debuggers/Debug.cpp @@ -150,6 +150,8 @@ void Pdb::Lock() watches.Disable(); locals.Disable(); framelist.Disable(); + frame_down.Disable(); + frame_up.Disable(); dlock.Show(); IdeSetBar(); } @@ -164,6 +166,8 @@ void Pdb::Unlock() watches.Enable(); locals.Enable(); framelist.Enable(); + frame_down.Enable(); + frame_up.Enable(); dlock.Hide(); IdeSetBar(); } diff --git a/uppsrc/ide/Debuggers/GdbCmd.cpp b/uppsrc/ide/Debuggers/GdbCmd.cpp index 301ce6bd7..ff2c6620d 100644 --- a/uppsrc/ide/Debuggers/GdbCmd.cpp +++ b/uppsrc/ide/Debuggers/GdbCmd.cpp @@ -78,6 +78,8 @@ void Gdb::Lock() watches.Disable(); locals.Disable(); frame.Disable(); + frame_up.Disable(); + frame_down.Disable(); dlock.Show(); } @@ -87,6 +89,8 @@ void Gdb::Unlock() watches.Enable(); locals.Enable(); frame.Enable(); + frame_up.Enable(); + frame_down.Enable(); dlock.Hide(); } }