summaryrefslogtreecommitdiff
path: root/ui/batch_status_handler.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:21:41 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:21:41 +0200
commitd6301fca6b78db52d0d98f8e0799aba175ad2e59 (patch)
tree0380aac034e0d70ee058db07900d80ff20cfc81e /ui/batch_status_handler.cpp
parent5.7 (diff)
downloadFreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.tar.gz
FreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.tar.bz2
FreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.zip
5.8
Diffstat (limited to 'ui/batch_status_handler.cpp')
-rw-r--r--ui/batch_status_handler.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/batch_status_handler.cpp b/ui/batch_status_handler.cpp
index 0fa3d01d..594ffb7a 100644
--- a/ui/batch_status_handler.cpp
+++ b/ui/batch_status_handler.cpp
@@ -1,14 +1,14 @@
// **************************************************************************
// * This file is part of the FreeFileSync project. It is distributed under *
// * GNU General Public License: http://www.gnu.org/licenses/gpl.html *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved *
// **************************************************************************
#include "batch_status_handler.h"
#include <zen/file_handling.h>
#include <zen/file_traverser.h>
+#include <zen/format_unit.h>
#include <wx+/app_main.h>
-#include <wx+/format_unit.h>
#include <wx+/shell_execute.h>
#include "msg_popup.h"
#include "exec_finished_box.h"
@@ -118,7 +118,7 @@ BatchStatusHandler::BatchStatusHandler(bool showProgress,
if (!tryReportingError([&] { logFile = prepareNewLogfile(logfileDirectory, jobName, timeStamp); }, //throw FileError; return value always bound!
*this))
{
- returnCode_ = FFS_RC_ABORTED;
+ raiseReturnCode(returnCode_, FFS_RC_ABORTED);
throw BatchAbortProcess();
}
@@ -141,13 +141,13 @@ BatchStatusHandler::~BatchStatusHandler()
std::wstring finalStatus;
if (abortIsRequested())
{
- returnCode_ = FFS_RC_ABORTED;
+ raiseReturnCode(returnCode_, FFS_RC_ABORTED);
finalStatus = _("Synchronization aborted!");
errorLog.logMsg(finalStatus, TYPE_ERROR);
}
else if (totalErrors > 0)
{
- returnCode_ = FFS_RC_FINISHED_WITH_ERRORS;
+ raiseReturnCode(returnCode_, FFS_RC_FINISHED_WITH_ERRORS);
finalStatus = _("Synchronization completed with errors!");
errorLog.logMsg(finalStatus, TYPE_WARNING);
}
bgstack15