close all satellites when the main window is closed or otherwise disc…

…onnected

src/gwt/src/org/rstudio/studio/client/application/Application.java

@@ -87,6 +87,7 @@ public Application(ApplicationView view,
       events_ = events;
       session_ = session;
       commands_ = commands;
+      satelliteManager_ = satelliteManager;
       clientStateUpdater_ = clientStateUpdater;
       server_ = server;
       uiPrefs_ = uiPrefs;
@@ -603,6 +604,8 @@ private void showToolbar(boolean showToolbar)
 
    private void cleanupWorkbench()
    {
+      satelliteManager_.closeAllSatellites();
+
       if (clientStateUpdaterInstance_ != null)
       {
          clientStateUpdaterInstance_.suspend();
@@ -620,6 +623,7 @@ private void navigateToSignIn()
    private final EventBus events_;
    private final Session session_;
    private final Commands commands_;
+   private final SatelliteManager satelliteManager_;
    private final Provider<ClientStateUpdater> clientStateUpdater_;
    private final Server server_;
    private final Provider<UIPrefs> uiPrefs_;

src/gwt/src/org/rstudio/studio/client/common/SatelliteManager.java

@@ -20,31 +20,33 @@ public SatelliteManager()
 
    }
 
+   // the main window should call this method during startup to set itself
+   // up to manage and communicate with the satellite windows
    public void initMainWindow()
    {
       // export the registration hook used by satellites
       exportSatelliteRegistrationCallback();
 
       // handle onClosed to automatically close all satellites
       Window.addCloseHandler(this);
-
    }
 
-
-
+   // satellite windows should call this during startup to setup a 
+   // communication channel with the main window
    public native void initSatelliteWindow() /*-{
       $wnd.isRStudioSatellite = true;
       $wnd.opener.registerAsRStudioSatellite($wnd);
    }-*/;
 
 
+   // check whether the current window is a satellite
    public native boolean isCurrentWindowSatellite() /*-{
       return !!$wnd.isRStudioSatellite;
    }-*/;
-
-   // close all satellites when we are closed
-   @Override
-   public void onClose(CloseEvent<Window> event)
+   
+
+   // close all satellite windows
+   public void closeAllSatellites()
    {
       for (int i=0; i<satellites_.size(); i++)
       {
@@ -57,16 +59,24 @@ public void onClose(CloseEvent<Window> event)
          {
          }
       } 
+      satellites_.clear();  
    }
 
+   // close all satellites when we are closed
+   @Override
+   public void onClose(CloseEvent<Window> event)
+   {
+      closeAllSatellites();
+   }
 
-
+   // called by satellites to connect themselves with the main window
    private void registerAsSatellite(JavaScriptObject wnd)
    {
       WindowEx satelliteWnd = wnd.<WindowEx>cast();
       satellites_.add(satelliteWnd);
    }
 
+   // export the global function requried for satellites to register
    private native void exportSatelliteRegistrationCallback() /*-{
       var manager = this;     
       $wnd.registerAsRStudioSatellite = $entry(