Merge remote-tracking branch 'origin/devel' into devel

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java

@@ -668,8 +668,6 @@ public class DataSourceDescriptor
         }
         log.debug("Connect with '" + getName() + "' (" + getId() + ")");
 
-        connecting = true;
-
         final String oldName = getConnectionConfiguration().getUserName();
         final String oldPassword = getConnectionConfiguration().getUserPassword();
         if (!isSavePassword()) {
@@ -690,6 +688,7 @@ public class DataSourceDescriptor
 
         processEvents(monitor, DBPConnectionEventType.BEFORE_CONNECT);
 
+        connecting = true;
         tunnelConnectionInfo = null;
         try {
             // Handle tunnel