haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly cleanup git repos and memory on project/frame deletion 

* Ensure the git backend is deleted when the project tree is deleted.
* Unload the git repo for a project when the project is unloaded from
  the tree.
This commit is contained in:
Ian McInerney 2024-02-18 15:02:43 +00:00 committed by Ian McInerney
parent 921358b096
commit 9456f35491
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/git/kicad_git_errors.h
View File

@ -33,6 +33,7 @@ class KIGIT_ERRORS
public: public:
KIGIT_ERRORS() = default; KIGIT_ERRORS() = default;
virtual ~KIGIT_ERRORS() = default;
const std::vector<wxString>& GetErrorStrings() const const std::vector<wxString>& GetErrorStrings() const
{ {

2
kicad/project_tree.cpp
View File

@ -50,7 +50,7 @@ PROJECT_TREE::PROJECT_TREE( PROJECT_TREE_PANE* parent ) :
m_statusImageList( nullptr ) m_statusImageList( nullptr )
{ {
m_projectTreePane = parent; m_projectTreePane = parent;
m_gitCommon = new KIGIT_COMMON( nullptr ); m_gitCommon = std::make_unique<KIGIT_COMMON>( nullptr );
// Make sure the GUI font scales properly on GTK // Make sure the GUI font scales properly on GTK
SetFont( KIUI::GetControlFont( this ) ); SetFont( KIUI::GetControlFont( this ) );

12
kicad/project_tree.h
View File

@ -25,6 +25,8 @@
#ifndef PROJECT_TREE_H #ifndef PROJECT_TREE_H
#define PROJECT_TREE_H #define PROJECT_TREE_H
#include <memory>
#include <git/kicad_git_common.h> #include <git/kicad_git_common.h>
#include <wx/treectrl.h> #include <wx/treectrl.h>
@ -42,10 +44,10 @@ class PROJECT_TREE : public wxTreeCtrl
DECLARE_DYNAMIC_CLASS( PROJECT_TREE ) DECLARE_DYNAMIC_CLASS( PROJECT_TREE )
private: private:
PROJECT_TREE_PANE* m_projectTreePane; PROJECT_TREE_PANE* m_projectTreePane;
wxImageList* m_imageList; wxImageList* m_imageList;
wxImageList* m_statusImageList; wxImageList* m_statusImageList;
KIGIT_COMMON* m_gitCommon; std::unique_ptr<KIGIT_COMMON> m_gitCommon;
public: public:
PROJECT_TREE_PANE* GetProjectTreePane() const { return m_projectTreePane; } PROJECT_TREE_PANE* GetProjectTreePane() const { return m_projectTreePane; }
@ -58,7 +60,7 @@ public:
void SetGitRepo( git_repository* aRepo ) { m_gitCommon->SetRepo( aRepo ); } void SetGitRepo( git_repository* aRepo ) { m_gitCommon->SetRepo( aRepo ); }
git_repository* GetGitRepo() const { return m_gitCommon->GetRepo(); } git_repository* GetGitRepo() const { return m_gitCommon->GetRepo(); }
KIGIT_COMMON* GitCommon() const { return m_gitCommon; } KIGIT_COMMON* GitCommon() const { return m_gitCommon.get(); }
private: private:
/* overridden sort function */ /* overridden sort function */

7
kicad/project_tree_pane.cpp
View File

@ -1482,6 +1482,13 @@ void PROJECT_TREE_PANE::EmptyTreePrj()
shutdownFileWatcher(); shutdownFileWatcher();
m_TreeProject->DeleteAllItems(); m_TreeProject->DeleteAllItems();
// Remove the git repository when the project is unloaded
if( m_TreeProject->GetGitRepo() )
{
git_repository_free( m_TreeProject->GetGitRepo() );
m_TreeProject->SetGitRepo( nullptr );
}
} }