[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6731] trunk/sql12

[<ger...@us...>]

Revision: 6731
          http://sourceforge.net/p/squirrel-sql/code/6731
Author:   gerdwagner
Date:     2013-01-06 21:56:47 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
#1060  When more result tabs than the maximum defined in Session properties are in execution, SQuirreL freezes.

Modified Paths:
--------------
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java
    trunk/sql12/doc/src/main/resources/changes.txt

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java	2013-01-04 16:08:55 UTC (rev 6730)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java	2013-01-06 21:56:47 UTC (rev 6731)
@@ -794,6 +794,10 @@
 
       while(props.getLimitSQLResultTabs() && props.getSqlResultTabLimit() < _tabbedExecutionsPanel.getTabCount())
       {
+         if(_tabbedExecutionsPanel.getComponentAt(0) instanceof CancelPanel)
+         {
+            break;
+         }
          closeTabAt(0);
       }
    }

Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt	2013-01-04 16:08:55 UTC (rev 6730)
+++ trunk/sql12/doc/src/main/resources/changes.txt	2013-01-06 21:56:47 UTC (rev 6731)
@@ -48,6 +48,8 @@
 
 Bug fixes:
 
+#1060  When more result tabs than the maximum defined in Session properties are in execution, SQuirreL freezes.
+
 Fixed bug in logging: Log level could not be set in log4j.properties file.
 
 2759952 (Update fails unless run as admin on Vista): Fixed mis-spelled variable in squirrel-sql.bat which

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.