From 4b9054c4637a391fab2eb4225e911c514c310add Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 10 Feb 2023 16:26:52 +0100 Subject: [PATCH] Pdb: Fix debugger start for python debugging Do not stop at the first statement of the script when performing "normal" debug, stop at the first break point instead. Preserve the original behavior when debugging by triggering "Start and Break on Main". Task-number: QTCREATORBUG-28732 Change-Id: I3022071f28c086a2d0787ca5873e611f77e28369 Reviewed-by: hjk Reviewed-by: --- src/libs/utils/fancymainwindow.cpp | 2 +- src/plugins/debugger/pdb/pdbengine.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp index 1d7f3e03fa1..a19fc6c3c76 100644 --- a/src/libs/utils/fancymainwindow.cpp +++ b/src/libs/utils/fancymainwindow.cpp @@ -378,7 +378,7 @@ QDockWidget *FancyMainWindow::addDockForWidget(QWidget *widget, bool immutable) dockWidget->setProperty(dockWidgetActiveState, visible); }); - connect(dockWidget->toggleViewAction(), &QAction::triggered, this, [dockWidget] { + connect(dockWidget->toggleViewAction(), &QAction::triggered, dockWidget, [dockWidget] { if (dockWidget->isVisible()) dockWidget->raise(); }, Qt::QueuedConnection); diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index 1a7487f444f..fd749a2d0ce 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -128,7 +128,10 @@ void PdbEngine::handlePdbStarted() showStatusMessage(Tr::tr("Running requested..."), 5000); BreakpointManager::claimBreakpointsForEngine(this); notifyEngineRunAndInferiorStopOk(); - updateAll(); + if (runParameters().breakOnMain) + updateAll(); + else + continueInferior(); } void PdbEngine::interruptInferior()