#8406 Connection page: title icons update fix

plugins/org.jkiss.dbeaver.ui.editors.connection/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageAbstract.java

@@ -51,6 +51,8 @@ public abstract class ConnectionPageAbstract extends DialogPage implements IData
     protected ToolBar userManagementToolbar;
     private VariablesHintLabel variablesHintLabel;
 
+    private ImageDescriptor curImageDescriptor;
+
     public IDataSourceConnectionEditorSite getSite() {
         return site;
     }
@@ -184,8 +186,9 @@ public abstract class ConnectionPageAbstract extends DialogPage implements IData
 
     @Override
     public void setImageDescriptor(ImageDescriptor desc) {
-        /*if (getImage() == null) */{
+        if (curImageDescriptor != desc) {
             super.setImageDescriptor(desc);
+            curImageDescriptor = desc;
         }
     }
 

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/dialogs/MultiPageWizardDialog.java

@@ -353,13 +353,14 @@ public class MultiPageWizardDialog extends TitleAreaDialog implements IWizardCon
 
     @Override
     public void updateTitleBar() {
-        setTitleImage(getCurrentPage().getImage());
+        //setTitleImage(getCurrentPage().getImage());
     }
 
     @Override
     public void updateWindowTitle() {
         getShell().setText(getWizard().getWindowTitle());
-        getShell().setImage(getWizard().getDefaultPageImage());//DBeaverIcons.getImage(activeDataSource.getObjectImage()));
+        // Do not update dialog icon. It can be disposed in the page and this will break connection dialog
+        //getShell().setImage(getWizard().getDefaultPageImage());//DBeaverIcons.getImage(activeDataSource.getObjectImage()));
 
         updateMessage();
     }