Fix crash when staging/unstaging too fast (or something like that).

SpartanJ · Jan 27, 2025 · 0005f9f · 0005f9f
1 parent 934a1f3
commit 0005f9f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/tools/ecode/plugins/debugger/debuggerplugin.cpp b/src/tools/ecode/plugins/debugger/debuggerplugin.cpp
@@ -1,4 +1,3 @@
-#include "debuggerplugin.hpp"
 #include "../../notificationcenter.hpp"
 #include "../../projectbuild.hpp"
 #include "../../terminalmanager.hpp"
@@ -8,6 +7,7 @@
 #include "bussocket.hpp"
 #include "bussocketprocess.hpp"
 #include "dap/debuggerclientdap.hpp"
+#include "debuggerplugin.hpp"
 #include "models/breakpointsmodel.hpp"
 #include "models/processesmodel.hpp"
 #include "models/variablesmodel.hpp"
@@ -1261,7 +1261,11 @@ void DebuggerPlugin::onRegisterDocument( TextDocument* doc ) {
 		}
 	} );
 
-	doc->setCommand( "debugger-start", [this] { runCurrentConfig(); } );
+	doc->setCommand( "debugger-start", [this] {
+		if ( mDebugger )
+			exitDebugger( true );
+		runCurrentConfig();
+	} );
 
 	doc->setCommand( "debugger-stop", [this] { exitDebugger( true ); } );
 

diff --git a/src/tools/ecode/plugins/git/gitplugin.cpp b/src/tools/ecode/plugins/git/gitplugin.cpp
@@ -1,5 +1,5 @@
-#include "gitplugin.hpp"
 #include "gitbranchmodel.hpp"
+#include "gitplugin.hpp"
 #include "gitstatusmodel.hpp"
 #include <eepp/graphics/primitives.hpp>
 #include <eepp/scene/scenemanager.hpp>
@@ -1583,10 +1583,10 @@ void GitPlugin::buildSidePanelTab() {
 	} );
 	mStatusTree->on( Event::OnModelEvent, [this]( const Event* event ) {
 		const ModelEvent* modelEvent = static_cast<const ModelEvent*>( event );
-		if ( modelEvent->getModel() == nullptr )
+		auto modelShared = mStatusTree->getModelShared();
+		if ( !modelShared )
 			return;
-
-		auto model = static_cast<const GitStatusModel*>( modelEvent->getModel() );
+		auto model = static_cast<GitStatusModel*>( modelShared.get() );
 
 		if ( modelEvent->getModelIndex().internalId() == GitStatusModel::GitFile ) {
 			const Git::DiffFile* file = model->file( modelEvent->getModelIndex() );
@@ -1640,10 +1640,11 @@ void GitPlugin::buildSidePanelTab() {
 									 i18n( "git_discard_all", "Discard All" ) );
 						}
 
-						menu->on( Event::OnItemClicked, [this, model, repoPath,
+						menu->on( Event::OnItemClicked, [this, modelShared, repoPath,
 														 type]( const Event* event ) {
-							if ( !mGit )
+							if ( !mGit || !modelShared )
 								return;
+							auto model = static_cast<GitStatusModel*>( modelShared.get() );
 							UIMenuItem* item = event->getNode()->asType<UIMenuItem>();
 							std::string id( item->getId() );
 							if ( id == "git-commit" ) {