Block close button on query tab while its query thread is running. Fixes issue #3063.

This commit is contained in:
Ansgar Becker
2012-12-18 18:30:14 +00:00
parent e12b4e652f
commit f9af910ffe
2 changed files with 13 additions and 4 deletions

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: HeidiSQL\n"
"POT-Creation-Date: 2012-11-05 21:40\n"
"PO-Revision-Date: 2012-12-13 21:33+0100\n"
"PO-Revision-Date: 2012-12-18 19:28+0100\n"
"Last-Translator: Ansgar Becker <heidisql@anse.de>\n"
"Language-Team: English (http://www.transifex.com/projects/p/heidisql/"
"language/en/)\n"
@@ -5562,3 +5562,9 @@ msgstr "Minute"
#. Table tools
msgid "Second"
msgstr "Second"
#. Query tab close button
msgid ""
"Cannot close tab with running query. Please wait until query has finished."
msgstr ""
"Cannot close tab with running query. Please wait until query has finished."

View File

@@ -9576,9 +9576,12 @@ var
Tab: TQueryTab;
begin
Tab := QueryTabs[PageIndex-tabQuery.PageIndex];
if (not Tab.Memo.Modified) or (not AppSettings.ReadBool(asPromptSaveFileOnTabClose)) then
Result := True
else begin
if Tab.QueryRunning then begin
LogSQL(_('Cannot close tab with running query. Please wait until query has finished.'));
Result := False;
end else if not Tab.Memo.Modified then begin
Result := True;
end else begin
// Unhide tabsheet so the user sees the memo content
Tab.TabSheet.PageControl.ActivePage := Tab.TabSheet;
if Tab.MemoFilename <> '' then