Always append the extra query line when available

FossilOrigin-Name: 964aff7d35acde4197dc863a6808f3a980b4e6cc
This commit is contained in:
Kostas
2014-07-31 07:22:03 +00:00
parent a24cbb6dcb
commit 888e1a42b3
3 changed files with 13 additions and 11 deletions

View File

@ -1236,12 +1236,14 @@ bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int
QString query = ParseFossilQuery(last_line);
QMessageBox::StandardButtons buttons = QMessageBox::YesToAll|QMessageBox::Yes|QMessageBox::No;
// Add any extra text available to the query
before_last_line = before_last_line.trimmed();
if(!before_last_line.isEmpty())
query = before_last_line + "\n" + query;
// Map the Convert option to the Apply button
if(have_acyn_query)
{
query = before_last_line + "\n" + query;
buttons |= QMessageBox::Apply;
}
QMessageBox::StandardButton res = DialogQuery(this, "Fossil", query, buttons);
if(res==QMessageBox::Yes)