Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-12 01:20:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix debugger plugin reload.

Browse Source
This commit is contained in:
Martín Lucas Golini
2025-01-13 12:21:43 -03:00
parent fb3b866f29
commit 0e5337d1b0
5 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/tools/ecode/plugins/debugger/debuggerplugin.cpp
View File

@@ -61,8 +61,15 @@ DebuggerPlugin::~DebuggerPlugin() {
waitUntilLoaded();
mShuttingDown = true;
if ( mSidePanel && mTab )
mSidePanel->removeTab( mTab );
if ( mSidePanel && mTab ) {
if ( Engine::isRunninMainThread() )
mSidePanel->removeTab( mTab );
else {
auto sidePanel = mSidePanel;
auto tab = mTab;
mSidePanel->runOnMainThread( [sidePanel, tab] { sidePanel->removeTab( tab ); } );
}
}
if ( getPluginContext()->getStatusBar() )
getPluginContext()->getStatusBar()->removeStatusBarElement( "status_app_debugger" );
@@ -619,6 +626,7 @@ void DebuggerPlugin::buildSidePanelTab() {
mUIDebuggerList->on( Event::OnValueChange, [this]( const Event* event ) {
mCurDebugger = event->getNode()->asType<UIDropDownList>()->getText().toUtf8();
mCurConfiguration = "";
} );
mUIDebuggerConfList->on( Event::OnValueChange, [this]( const Event* event ) {
@@ -667,8 +675,9 @@ void DebuggerPlugin::buildSidePanelTab() {
void DebuggerPlugin::updateSelectedDebugConfig() {
if ( mUIDebuggerList && mUIDebuggerConfList && !mCurDebugger.empty() ) {
mUIDebuggerList->runOnMainThread( [this] {
auto curConfig = mCurConfiguration;
mUIDebuggerList->getListBox()->setSelected( mCurDebugger );
mUIDebuggerConfList->getListBox()->setSelected( mCurConfiguration );
mUIDebuggerConfList->getListBox()->setSelected( curConfig );
} );
}
}
@@ -843,9 +852,11 @@ void DebuggerPlugin::updateSidePanelTab() {
}
if ( !empty ) {
if ( !mCurDebugger.empty() )
if ( !mCurDebugger.empty() ) {
auto curConfig = mCurConfiguration;
mUIDebuggerList->getListBox()->setSelected( mCurDebugger );
else
mCurConfiguration = std::move( curConfig );
} else
mUIDebuggerList->getListBox()->setSelected( 0L );
}
@@ -891,7 +902,7 @@ void DebuggerPlugin::updateDebuggerConfigurationList() {
std::string curConfig( mCurConfiguration );
mUIDebuggerConfList->getListBox()->clear();
mCurConfiguration = curConfig;
mCurConfiguration = std::move( curConfig );
std::string debuggerSelected = mUIDebuggerList->getListBox()->getItemSelectedText().toUtf8();