Fix MscrmTools#244 View Transfer Tool: Cannot connect to target organ…

…ization

XrmToolBox/MainForm.cs

@@ -94,7 +94,7 @@ private void ManageConnectionControl()
  if (pluginModel == null)
  {
  // Actual Plugin was passed, Just update the plugin's Tab.
- UpdateTabConnection((TabPage) control.Parent);
+ UpdateTabConnection((TabPage)control.Parent);
  }
  else
  {
@@ -398,7 +398,14 @@ private void MainForm_OnCloseTool(object sender, EventArgs e)
 
  private void MainForm_OnRequestConnection(object sender, EventArgs e)
  {
- ConnectUponApproval(sender);
+ if (e is RequestConnectionEventArgs)
+ {
+ ConnectUponApproval(e);
+ }
+ else
+ {
+ ConnectUponApproval(sender);
+ }
  }
 
  private void PluginClicked(object sender, EventArgs e)
@@ -681,17 +688,6 @@ private void ApplyConnectionToTabs()
  }
  }
 
- private void UpdateTabConnection(TabPage tab)
- {
- tab.GetPlugin().UpdateConnection(service, currentConnectionDetail);
-
- tab.Text = string.Format("{0} ({1})",
- ((Lazy<IXrmToolBoxPlugin, IPluginMetadata>) tab.Tag).Metadata.Name,
- currentConnectionDetail != null
- ? currentConnectionDetail.ConnectionName
- : "Not connected");
- }
-
  private string ExtractSwitchValue(string key, ref string[] args)
  {
  var name = string.Empty;
@@ -707,6 +703,17 @@ private string ExtractSwitchValue(string key, ref string[] args)
  return name;
  }
 
+ private void UpdateTabConnection(TabPage tab)
+ {
+ tab.GetPlugin().UpdateConnection(service, currentConnectionDetail);
+
+ tab.Text = string.Format("{0} ({1})",
+ ((Lazy<IXrmToolBoxPlugin, IPluginMetadata>)tab.Tag).Metadata.Name,
+ currentConnectionDetail != null
+ ? currentConnectionDetail.ConnectionName
+ : "Not connected");
+ }
+
  #endregion Other methods
  }
 }