diff options
| author | Ignacio Roldán Etcheverry <neikeq@users.noreply.github.com> | 2019-03-10 21:30:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-10 21:30:32 +0100 |
| commit | 91d3ea0d1f33af26328c741835a8ff72c58d34d7 (patch) | |
| tree | c4783845fd6b5e4c3869290cdbc3ae758dccd08e /modules/mono/mono_gd/gd_mono_assembly.cpp | |
| parent | 59aa79f2182c070a7f2c274072da50a5a2934e70 (diff) | |
| parent | e9e7aab8eb0216ba27529826c015bca1ddd49ff4 (diff) | |
Merge pull request #26874 from neikeq/issue-26731
Mono: Some assembly referencing changes and cleanup
Diffstat (limited to 'modules/mono/mono_gd/gd_mono_assembly.cpp')
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_assembly.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/modules/mono/mono_gd/gd_mono_assembly.cpp b/modules/mono/mono_gd/gd_mono_assembly.cpp index 11c40e9507..8fec28b186 100644 --- a/modules/mono/mono_gd/gd_mono_assembly.cpp +++ b/modules/mono/mono_gd/gd_mono_assembly.cpp @@ -277,6 +277,7 @@ Error GDMonoAssembly::load(bool p_refonly) { ERR_FAIL_NULL_V(image, ERR_FILE_CANT_OPEN); #ifdef DEBUG_ENABLED + Vector<uint8_t> pdb_data; String pdb_path(path + ".pdb"); if (!FileAccess::exists(pdb_path)) { @@ -286,8 +287,9 @@ Error GDMonoAssembly::load(bool p_refonly) { goto no_pdb; } - pdb_data.clear(); pdb_data = FileAccess::get_file_as_array(pdb_path); + + // mono_debug_close_image doesn't seem to be needed mono_debug_open_image_from_memory(image, &pdb_data[0], pdb_data.size()); no_pdb: @@ -306,6 +308,9 @@ no_pdb: ERR_FAIL_COND_V(status != MONO_IMAGE_OK || assembly == NULL, ERR_FILE_CANT_OPEN); + // Decrement refcount which was previously incremented by mono_image_open_from_data_with_name + mono_image_close(image); + loaded = true; modified_time = last_modified_time; @@ -321,8 +326,6 @@ Error GDMonoAssembly::wrapper_for_image(MonoImage *p_image) { image = p_image; - mono_image_addref(image); - loaded = true; return OK; @@ -332,13 +335,6 @@ void GDMonoAssembly::unload() { ERR_FAIL_COND(!loaded); -#ifdef DEBUG_ENABLED - if (pdb_data.size()) { - mono_debug_close_image(image); - pdb_data.clear(); - } -#endif - for (Map<MonoClass *, GDMonoClass *>::Element *E = cached_raw.front(); E; E = E->next()) { memdelete(E->value()); } @@ -346,8 +342,6 @@ void GDMonoAssembly::unload() { cached_classes.clear(); cached_raw.clear(); - mono_image_close(image); - assembly = NULL; image = NULL; loaded = false; |