Merge pull request #4093 from mansellan/4046

VB6 - Fix project and component events
rubberduck-vba · Jun 17, 2018 · 38be737 · 38be737
2 parents 27f33e3 + 4b6147c
commit 38be737
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBProject.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBProject.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
@@ -63,7 +64,20 @@ public EnvironmentMode Mode
                     return 0;
                 }
 
-                return (EnvironmentMode) EbMode();
+                // Note - the value returned by the EbMode function does NOT match with the EnvironmentMode enum, hence remapped below.
+                var ebMode = EbMode();
+                switch (ebMode)
+                {
+                    case 0:
+                        return EnvironmentMode.Design;
+                    case 1:
+                        return EnvironmentMode.Run;
+                    case 2:
+                        return EnvironmentMode.Break;
+                    default:
+                        Debug.Assert(false, $"Unexpected value '{ebMode}' returned from EbMode");
+                        return EnvironmentMode.Design;
+                }                
             }
         }