Skip to content

Commit 9d2c779

Browse files
committed
Check for null project IDs before raising events with them.
1 parent 601665c commit 9d2c779

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

Rubberduck.VBEEditor/SafeComWrappers/VBA/VBProjects.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private static void OnProjectRenamed(VB.VBProject vbProject, string oldName)
173173
var projectId = project.ProjectId;
174174

175175
var handler = ProjectRenamed;
176-
if (handler != null)
176+
if (handler != null && projectId != null)
177177
{
178178
handler(project, new ProjectRenamedEventArgs(projectId, project, oldName));
179179
}
@@ -201,7 +201,10 @@ private static void OnDispatch(EventHandler<ProjectEventArgs> dispatched, VB.VBP
201201
project.AssignProjectId();
202202
}
203203
var projectId = project.ProjectId;
204-
handler.Invoke(project, new ProjectEventArgs(projectId, project));
204+
if (projectId != null)
205+
{
206+
handler.Invoke(project, new ProjectEventArgs(projectId, project));
207+
}
205208
}
206209
}
207210

0 commit comments

Comments
 (0)