AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed fossil operation termination flag

Browse Source 
FossilOrigin-Name: f791fda7d73f7e7b71b28ecbaefd93330090a834
This commit is contained in:
kostas
2015-04-29 12:35:33 +00:00
parent a661606572
commit c7cfa079a4
6 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/MainWindow.cpp
View File

@@ -198,7 +198,7 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
if(workspacePath && !workspacePath->isEmpty())
openWorkspace(*workspacePath);
abortOperation = false;
operationAborted = false;
rebuildRecent();
}
@@ -612,7 +612,7 @@ void MainWindow::scanWorkspace()
workspaceFiles.clear();
pathSet.clear();
abortOperation = false;
operationAborted = false;
if(scan_files)
{
@@ -626,7 +626,7 @@ void MainWindow::scanWorkspace()
ignore = settings.GetFossilValue(FOSSIL_SETTING_IGNORE_GLOB).toString().replace(',',';');
}
if(!scanDirectory(all_files, wkdir, wkdir, ignore, abortOperation))
if(!scanDirectory(all_files, wkdir, wkdir, ignore, operationAborted))
goto _done;
for(QFileInfoList::iterator it=all_files.begin(); it!=all_files.end(); ++it)
@@ -2154,7 +2154,8 @@ void MainWindow::setBusy(bool busy)
//------------------------------------------------------------------------------
void MainWindow::onAbort()
{
abortOperation = true;
operationAborted = true;
bridge.abortOperation();
// FIXME: Rename this to something better, Operation Aborted
log("<br><b>* "+tr("Terminated")+" *</b><br>", true);
}