[Version Control] Initialize VersionControlService properly.

IdeApp.Initialized will either queue the call or call it directly.
This fixes Bug 13745.

1 files changed, 21 insertions, 20 deletions

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
index 8aaa65af5a..0cae52a832 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
@@ -49,28 +49,28 @@ namespace MonoDevelop.VersionControl
 		public static event FileUpdateEventHandler FileStatusChanged;

 		public static event CommitEventHandler PrepareCommit;

 		public static event CommitEventHandler BeginCommit;

-		public static event CommitEventHandler EndCommit;

+		public static event CommitEventHandler EndCommit;
 		
 		static VersionControlService ()
 		{
-			if (IdeApp.IsInitialized) {
+			IdeApp.Initialized += delegate {
 				try {
-					overlay_modified = Gdk.Pixbuf.LoadFromResource("overlay_modified.png");

-					overlay_removed = Gdk.Pixbuf.LoadFromResource("overlay_removed.png");

-					overlay_conflicted = Gdk.Pixbuf.LoadFromResource("overlay_conflicted.png");

-					overlay_added = Gdk.Pixbuf.LoadFromResource("overlay_added.png");

-					overlay_controled = Gdk.Pixbuf.LoadFromResource("overlay_controled.png");
-					overlay_unversioned = Gdk.Pixbuf.LoadFromResource("overlay_unversioned.png");
-					overlay_protected = Gdk.Pixbuf.LoadFromResource("overlay_lock_required.png");
-					overlay_unlocked = Gdk.Pixbuf.LoadFromResource("overlay_unlocked.png");
-					overlay_locked = Gdk.Pixbuf.LoadFromResource("overlay_locked.png");
+					overlay_modified = Gdk.Pixbuf.LoadFromResource ("overlay_modified.png");
+					overlay_removed = Gdk.Pixbuf.LoadFromResource ("overlay_removed.png");
+					overlay_conflicted = Gdk.Pixbuf.LoadFromResource ("overlay_conflicted.png");
+					overlay_added = Gdk.Pixbuf.LoadFromResource ("overlay_added.png");
+					overlay_controled = Gdk.Pixbuf.LoadFromResource ("overlay_controled.png");
+					overlay_unversioned = Gdk.Pixbuf.LoadFromResource ("overlay_unversioned.png");
+					overlay_protected = Gdk.Pixbuf.LoadFromResource ("overlay_lock_required.png");
+					overlay_unlocked = Gdk.Pixbuf.LoadFromResource ("overlay_unlocked.png");
+					overlay_locked = Gdk.Pixbuf.LoadFromResource ("overlay_locked.png");
 		//			overlay_normal = Gdk.Pixbuf.LoadFromResource("overlay_normal.png");
-				

-					icon_modified = ImageService.GetPixbuf ("gtk-edit", Gtk.IconSize.Menu);

-					icon_removed = ImageService.GetPixbuf (Gtk.Stock.Remove, Gtk.IconSize.Menu);

-					icon_conflicted = ImageService.GetPixbuf (Gtk.Stock.DialogWarning, Gtk.IconSize.Menu);

-					icon_added = ImageService.GetPixbuf (Gtk.Stock.Add, Gtk.IconSize.Menu);

-					icon_controled = Gdk.Pixbuf.LoadFromResource("overlay_controled.png");
+
+					icon_modified = ImageService.GetPixbuf ("gtk-edit", Gtk.IconSize.Menu);
+					icon_removed = ImageService.GetPixbuf (Gtk.Stock.Remove, Gtk.IconSize.Menu);
+					icon_conflicted = ImageService.GetPixbuf (Gtk.Stock.DialogWarning, Gtk.IconSize.Menu);
+					icon_added = ImageService.GetPixbuf (Gtk.Stock.Add, Gtk.IconSize.Menu);
+					icon_controled = Gdk.Pixbuf.LoadFromResource ("overlay_controled.png");
 				} catch (Exception e) {
 					LoggingService.LogError ("Error while loading icons.", e);
 				}
@@ -79,15 +79,16 @@ namespace MonoDevelop.VersionControl
 				//IdeApp.Workspace.FileChangedInProject += OnFileChanged;
 				//IdeApp.Workspace.FileRemovedFromProject += OnFileRemoved;
 				//IdeApp.Workspace.FileRenamedInProject += OnFileRenamed;
-				
+
 				IdeApp.Workspace.ItemAddedToSolution += OnEntryAdded;
 				IdeApp.Exiting += delegate {
 					DelayedSaveComments (null);
 				};
-			}			
+			};
+
 			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/VersionControl/VersionControlSystems", OnExtensionChanged);
 		}
-		
+
 		static void OnExtensionChanged (object s, ExtensionNodeEventArgs args)
 		{
 			VersionControlSystem vcs = (VersionControlSystem) args.ExtensionObject;